From c57197c8fc1f3f6419a728a5f8b60457c468accb Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 22 Aug 2012 22:33:24 +0530 Subject: posix-acl: make use of 'umask' flag passed as argument in fop * currently "umask" is reffered only from xdata dictionary, instead we should utilize fop argument. * not taking of setting of "umask" in fuse for now, considering the backward compatibility with earlier releases. * dict_del() the "umask" and "mode" keys from xdata dict as the fop after reaching posix layer tries to set every entry in xdata as xattr on file/dir. Change-Id: I7199b05a5bde132df20e7812a99bc02ef7b988ce Signed-off-by: Amar Tumballi BUG: 850873 Reviewed-on: http://review.gluster.org/3843 Tested-by: Gluster Build System Reviewed-by: Brian Foster Reviewed-by: Anand Avati --- xlators/mount/fuse/src/fuse-bridge.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'xlators/mount/fuse') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 7915964ed..755b79511 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -1319,6 +1319,10 @@ fuse_mknod (xlator_t *this, fuse_in_header_t *finh, void *msg) return; } state->umask = fmi->umask; + + /* TODO: remove this after 3.4.0 release. keeping it for the + sake of backward compatibility with old (3.3.[01]) + releases till then. */ ret = dict_set_int16 (state->xdata, "umask", fmi->umask); if (ret < 0) { gf_log ("glusterfs-fuse", GF_LOG_WARNING, @@ -1413,6 +1417,10 @@ fuse_mkdir (xlator_t *this, fuse_in_header_t *finh, void *msg) return; } state->umask = fmi->umask; + + /* TODO: remove this after 3.4.0 release. keeping it for the + sake of backward compatibility with old (3.3.[01]) + releases till then. */ ret = dict_set_int16 (state->xdata, "umask", fmi->umask); if (ret < 0) { gf_log ("glusterfs-fuse", GF_LOG_WARNING, @@ -1922,6 +1930,10 @@ fuse_create (xlator_t *this, fuse_in_header_t *finh, void *msg) return; } state->umask = fci->umask; + + /* TODO: remove this after 3.4.0 release. keeping it for the + sake of backward compatibility with old (3.3.[01]) + releases till then. */ ret = dict_set_int16 (state->xdata, "umask", fci->umask); if (ret < 0) { gf_log ("glusterfs-fuse", GF_LOG_WARNING, -- cgit