autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2014-06-14-0214/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-06-14-0214/samba.stderr http://git.samba.org/autobuild.flakey/2014-06-14-0214/samba.stdout The top commit at the time of the failure was: commit c70932827812cf3b3fc8323e11abf4c98f15ddec Author: Michael Adam Date: Fri Jun 13 12:05:05 2014 +0200 vfs:gpfs: fix a debug message Signed-off-by: Michael Adam Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Fri Jun 13 19:54:23 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c709328 vfs:gpfs: fix a debug message
via 9f6c4c4 vfs: update a bit-rotten comment
via ddb7d7f vfs: remove unused function vfs_pread_data()
from 5c87425 man vfs_streams_xattr: new options "prefix" and
"store_stream_type"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c70932827812cf3b3fc8323e11abf4c98f15ddec
Author: Michael Adam
Date: Fri Jun 13 12:05:05 2014 +0200
vfs:gpfs: fix a debug message
Signed-off-by: Michael Adam
Reviewed-by: Volker Lendecke
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Fri Jun 13 19:54:23 CEST 2014 on sn-devel-104
commit 9f6c4c4da20df633b28c1f3047e62c0daa6f6931
Author: Michael Adam
Date: Fri Jun 13 11:46:25 2014 +0200
vfs: update a bit-rotten comment
Signed-off-by: Michael Adam
Reviewed-by: Volker Lendecke
commit ddb7d7fc940835e04a5d909790f99cee5c74084d
Author: Michael Adam
Date: Fri Jun 13 11:39:41 2014 +0200
vfs: remove unused function vfs_pread_data()
Signed-off-by: Michael Adam
Reviewed-by: Volker Lendecke
---
Summary of changes:
source3/include/vfs_macros.h | 11 ++-
source3/modules/gpfs.c |2 +-
source3/smbd/proto.h |2 --
source3/smbd/vfs.c | 22 --
4 files changed, 7 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 704054d..0f44c62 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -21,11 +21,12 @@
#ifndef _VFS_MACROS_H
#define _VFS_MACROS_H
-/***
- Don't access conn->vfs.ops.* directly!!!
- Use this macros!
- (Fixes should go also into the vfs_opaque_* and vfs_next_* macros!)
-/
+/*
+ * These macros SMB_VFS_ (and SMB_VFS_NEXT_) are our
+ * interface for the VFS.
+ *
+ * Don't access conn->vfs_handles[->next]->fns->* directly!
+ */
/* Disk operations */
#define SMB_VFS_CONNECT(conn, service, user) \
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 6250286..53418f0 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -177,7 +177,7 @@ int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr
*attrs)
errno = ENOSYS;
return -1;
}
-DEBUG(10, ("gpfs_get_winattrs_path:open call %d\n", fd));
+DEBUG(10, ("gpfs_get_winattrs:open call %d\n", fd));
return gpfs_get_winattrs_fn(fd, attrs);
}
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 3c6accf..1e17f5b 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1129,8 +1129,6 @@ bool vfs_init_custom(connection_struct *conn, const char
*vfs_object);
bool smbd_vfs_init(connection_struct *conn);
NTSTATUS vfs_file_exist(connection_struct *conn, struct smb_filename
*smb_fname);
ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count);
-ssize_t vfs_pread_data(files_struct *fsp, char *buf,
-size_t byte_count, off_t offset);
ssize_t vfs_write_data(struct smb_request *req,
files_struct *fsp,
const char *buffer,
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 897bf1f..d5390ed 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -393,28 +393,6 @@ ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t
byte_count)
return (ssize_t)total;
}
-ssize_t vfs_pread_data(files_struct *fsp, char *buf,
-size_t byte_count, off_t offset)
-{
- size_t total=0;
-
- while (total < byte_count)
- {
- ssize_t ret = SMB_VFS_PREAD(fsp, buf + total,
- byte_count - total, offset + total);
-
- if (ret == 0) return total;
- if (ret == -1) {
- if (errno == EINTR)
- continue;
- else
- return -1;
- }
- total += ret;
- }
- return (ssize_t)total;
-}
-
/
Write data to a fd on the vfs.
/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5c87425 man vfs_streams_xattr: new options "prefix" and "store_stream_type" via 634bcb0 vfs_streams_xattr: add options "prefix" and "store_stream_type" via f03e8b1 Convert samba_private_attr_name() to a public function via 3defbe2 locking: use correct conversion specifier for printing variables from 0057388 leases: Fix uint32->hyper http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5c874251ff78708706c7b421bb24c00ccd995a65 Author: Ralph Boehme Date: Mon May 26 16:12:17 2014 +0200 man vfs_streams_xattr: new options "prefix" and "store_stream_type" Add documentation for the two new options "streams_xattr:prefix" and "streams_xattr:store_stream_type". Signed-off-by: Ralph Boehme Reviewed-by: Christof Schmitt Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Fri Jun 13 15:51:43 CEST 2014 on sn-devel-104 commit 634bcb09a08b927fd79ae0e16aeee2a123605f94 Author: Ralph Boehme Date: Tue May 20 15:17:01 2014 +0200 vfs_streams_xattr: add options "prefix" and "store_stream_type" Add module options that can be used to configure the stream prefix the module uses (option "prefix", a string) and whether the stream type "$DATA" is appended to the xattr name on disk (option "store_stream_type", a boolean). The default "prefix" is "user.DosStream" and the default for "store_stream_type" is true, this gives unchanged default behaviour when not specifying this option. OS X SMB clients will send xattrs as named streams over the wire, by setting the options to the following values streams_xattr:prefix = user. streams_xattr:store_stream_type = no OS X xattrs will be stored on disk on the server with their unmodified names and as such provide interoperability with other protocols like AFP. In order to prevent access to our internal Samba xattrs, check the xattr name with the function samba_private_attr_name() made public by the previous commit. Signed-off-by: Ralph Boehme Reviewed-by: Christof Schmitt Reviewed-by: Michael Adam commit f03e8b12c6959fb8213fbfcd3792b70094bd9a71 Author: Ralph Boehme Date: Wed May 21 11:52:27 2014 +0200 Convert samba_private_attr_name() to a public function Signed-off-by: Ralph Boehme Reviewed-by: Christof Schmitt Reviewed-by: Michael Adam commit 3defbe273459262f333cca91e90a0941a812df1a Author: Ralph Boehme Date: Sun Jun 1 15:16:16 2014 +0200 locking: use correct conversion specifier for printing variables Fix several occurences of using printf conversion to fload when printing offset and count variables in locking debug messages and smbstatus. Conversion to float may lead to wrong results with very large values. Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke Reviewed-by: Michael Adam --- Summary of changes: docs-xml/manpages/vfs_streams_xattr.8.xml | 34 - source3/locking/locking.c |4 +- source3/locking/posix.c | 13 ++-- source3/modules/vfs_streams_xattr.c | 122 ++--- source3/smbd/proto.h |1 + source3/smbd/trans2.c |2 +- source3/utils/status.c|4 +- 7 files changed, 137 insertions(+), 43 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_streams_xattr.8.xml b/docs-xml/manpages/vfs_streams_xattr.8.xml index 5aa5aa8..2deb802 100644 --- a/docs-xml/manpages/vfs_streams_xattr.8.xml +++ b/docs-xml/manpages/vfs_streams_xattr.8.xml @@ -33,8 +33,11 @@ alternate data streams in the file system. As a normal posix file system does not support the concept of multiple data streams per file, the streams_xattr module stores the data in posix extended attributes - (xattrs). The name of these attributes is - user.DosStream."ADS-NAME". + (xattrs). The name of these attributes by default is + user.DosStream."ADS-NAME". The prefix "user.DosStream." can be changed + with the module option streams_xattr:prefix, but be + aware that this will also expose those ADS over the SMB extended + attributes interface. The file system that is shared with this module enabled must support xattrs. @@ -46,6 +49,33 @@ + OPTIONS + + + + + streams_xattr:prefix = STRING + + Name prefix used when storing an ADS in an xattr, defaults to + user.DosStream.. Changing this will also + expose ADS over the SMB extended attributes interface. +
[SCM] CTDB repository - branch 2.5 updated - ctdb-2.5.3-50-gc6f91dd
The branch, 2.5 has been updated via c6f91dd3df0f8604a2eadef3c44025e07a1c1a03 (commit) via 515736c53eb87fd76a16a6fef59ab8255b07da24 (commit) via ef604d51ee17d88727406425074f631c996bca0e (commit) via 904bb9b95625541c77ccda1f8e03057b9446b879 (commit) via a3d3b994df3e51316bc355fba6402d62e0cbf519 (commit) via 262ec107e269a349baae3ca6b72b4a1a0a18f72d (commit) via 6a8c8a0029b1d1b7a8f80343666f30385c24223c (commit) via 6aabb15346e5be2470d95e96b6a36aa2317325b0 (commit) via 23561cca2b3496d5a47977d5ce2600e8951dec39 (commit) via ba2f7b3ea67468f38f2f80266c20a3c29a1c1f79 (commit) via 2b41fd554889876b848c30790c0272e58dbd025c (commit) via 1a4433d0d620d8104bc75ba5d10e4394a0d37e5a (commit) via d94e082ebcdfb6cb6e050fa2a5ace6ff13869cf4 (commit) via 57eb4e57beef2b5cde351e9634fb4afd70354ac0 (commit) via b4bb7bfd2d4eaee57707a2716006337f2e594bee (commit) via 385d1ee07ad1f8476a2810be1f8551e9d28fc336 (commit) via 7d30073689fd6be1f284bd6e6423abc4a8fd882d (commit) via 25a6bfc9ddfd42b9fc3ee0069b793311b649eaf1 (commit) via 5c94a3b492b600265ddd3b85394f19c66a9b566a (commit) via 5821e5ebc4e2845947e60ca4c1751cdade389576 (commit) via 9d4f41da1282369ffca3ef9e4259d0b0d48eb1ad (commit) via 2b2b7941ccbd1a1ae0e8743ed63ea8ecebf031e2 (commit) via e015f6643efc274c282d8d31e77aaa7c9470b3e3 (commit) via 8c95317efb9d673aef4c059b3fcbb75197fb046f (commit) from 31a4dde35d9037fe1bc48128186619b820358e8b (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5 - Log - commit c6f91dd3df0f8604a2eadef3c44025e07a1c1a03 Author: Amitay Isaacs Date: Fri Jun 6 16:49:13 2014 +1000 daemon: Reset scheduler policy for helper processes Do not run helper processes with real-time priority. This regression was caused when locking and eventscript code switched to use vfork() and helper instead of ctdb_fork(). Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Thu Jun 12 08:10:36 CEST 2014 on sn-devel-104 (Imported from commit 9e6e48750d1fad8ec7cd076f7ca7d2b028007258) commit 515736c53eb87fd76a16a6fef59ab8255b07da24 Author: Amitay Isaacs Date: Tue Jun 10 12:17:32 2014 +1000 daemon: Do not complain if node is inactive and db is not attached Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit e9eed41d7ffded2dfd1406f60ad08fe070fd52c1) commit ef604d51ee17d88727406425074f631c996bca0e Author: Amitay Isaacs Date: Tue Jun 10 11:56:39 2014 +1000 build: Remove duplicate library dependency LIB_FLAGS includes TDB_LIBS. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 79a6bd269291a4b4dabc57254b79bbfa82ac70e4) commit 904bb9b95625541c77ccda1f8e03057b9446b879 Author: Amitay Isaacs Date: Fri Jun 6 16:46:15 2014 +1000 daemon: Remove duplicate code from helper binaries Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 71ed758c72db36234209428fa54be82fe8f0899a) commit a3d3b994df3e51316bc355fba6402d62e0cbf519 Author: Amitay Isaacs Date: Fri Jun 6 15:43:22 2014 +1000 logging: Move controls handling functions from common to server Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit e7c72588d187f9505444f48a1c5b19e47b15ccd9) commit 262ec107e269a349baae3ca6b72b4a1a0a18f72d Author: Amitay Isaacs Date: Tue Jun 10 14:52:19 2014 +1000 logging: Split ringbuffer handling code from ctdb_collect_log Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 27d1137e26703d7fa5fba638e56961384a140eb2) commit 6a8c8a0029b1d1b7a8f80343666f30385c24223c Author: Amitay Isaacs Date: Fri Jun 6 15:25:08 2014 +1000 common: Move mkdir_p_or_die to system utilities Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 49e34651a95a336c9e410e4b52a8cfd491ca0a67) commit 6aabb15346e5be2470d95e96b6a36aa2317325b0 Author: Amitay Isaacs Date: Fri Jun 6 15:24:20 2014 +1000 daemon: Rename ctdb_mkdir_p_or_die to mkdir_p_or_die This function does not require ctdb context. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 4736486188afb8ff6243bcc8a27daa9dbcc64b7a) commit 23561cca2b3496d5a47977d5ce2600e8951dec39 Author: Amitay Isaacs Date: Tue Jun 10 17:04:34 2014 +1000 common: Move lockdown_memory to system utilities Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (Imported from commit 507207e40b193ba753604666c56dfa29c29b7145) commit ba2f7b3ea67468f38f2f80266c20
