The branch, master has been updated
via 57a03c6 autobuild: adapt a comment
via af9ec9f vfs/glusterfs: Change xattr key to match gluster key.
from 051b81a vfs_glusterfs: Implement AIO support
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 57a03c694730e3503c54c124d02e6c616b8a272f
Author: Michael Adam <[email protected]>
Date: Sat Dec 6 03:01:53 2014 +0100
autobuild: adapt a comment
The configure-option --with-cluster-support now only builds
against the included ctdb, and it also builds the ctdb component.
The comment in autobuild.py this patch changes was still from the olden
days...
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Wed Dec 17 21:13:44 CET 2014 on sn-devel-104
commit af9ec9fea5a730023cdee6e236f9585e3a18b0e6
Author: raghavendra talur <[email protected]>
Date: Wed Dec 10 21:15:03 2014 +0530
vfs/glusterfs: Change xattr key to match gluster key.
Gluster changed the key used to do get_real_filename
in 3.5. This changes Samba's glusterfs vfs-module
to use the same key.
This will render SMB_VFS_GET_REALFILENAME() working
again under 3.5 and will remove support for that functionality
for Gluster 3.4 and older.
Signed-off-by: raghavendra talur <[email protected]>
Reviewed-by: Ira Cooper <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
script/autobuild.py | 2 +-
source3/modules/vfs_glusterfs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/autobuild.py b/script/autobuild.py
index e776df8..55e4449 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -59,7 +59,7 @@ tasks = {
("tdb-install", "cd lib/tdb && make install",
"text/plain"),
- # build samba with cluster support against this ctdb:
+ # build samba with cluster support (also building ctdb):
("samba-configure",
"PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH
PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
./configure.developer --picky-developer ${PREFIX}
--with-selftest-prefix=./bin/ab --with-cluster-support
--bundled-libraries=!tdb", "text/plain"),
("samba-make", "make", "text/plain"),
("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT",
"text/plain"),
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 68aea40..10c3a22 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1110,7 +1110,7 @@ static int vfs_gluster_get_real_filename(struct
vfs_handle_struct *handle,
}
snprintf(key_buf, NAME_MAX + 64,
- "user.glusterfs.get_real_filename:%s", name);
+ "glusterfs.get_real_filename:%s", name);
ret = glfs_getxattr(handle->data, path, key_buf, val_buf, NAME_MAX + 1);
if (ret == -1) {
--
Samba Shared Repository
