summaryrefslogtreecommitdiffstats
path: root/xlators/mount
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2012-08-22 22:33:24 +0530
committerAnand Avati <avati@redhat.com>2012-08-23 01:02:43 -0700
commitc57197c8fc1f3f6419a728a5f8b60457c468accb (patch)
tree5f1c47b58c55e87a437d13546ee4760cbe862d7f /xlators/mount
parentc48387d8e43f83b06acf329ece6c0278a7911d1e (diff)
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 <amarts@redhat.com> BUG: 850873 Reviewed-on: http://review.gluster.org/3843 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mount')
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index 7915964ed95..755b7951190 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,