diff options
author | Günther Deschner <gd@samba.org> | 2017-10-09 17:50:19 +0200 |
---|---|---|
committer | jiffin tony Thottan <jthottan@redhat.com> | 2017-11-06 06:15:30 +0000 |
commit | b0790bc6ee41fc8a4a9ee5591169a1d8eca3f20d (patch) | |
tree | 322437ad091b0ec368c3eba62d4688e1c22c88ef /xlators | |
parent | 213dfd853bfa8c46d4032698a10208516437ad6a (diff) |
md-cache: Use correct xattr keynames for virtual glusterfs ACLs.
The "glusterfs.posix_acl." prefix does not catch the glusterfs posix acl
xattr keynames which are
* "glusterfs.posix.acl" and
* "glusterfs.posix.default_acl"
Using the GF_POSIX_ACL_ACCESS and GF_POSIX_ACL_DEFAULT defines directly
is the savest option.
Guenther
> BUG: 1476295
> Signed-off-by: Guenther Deschner <gd@samba.org>
> Reviewed-on: https://review.gluster.org/17909
> Reviewed-by: Michael Adam <obnox@samba.org>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>
> Tested-by: Niels de Vos <ndevos@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit 5fe8555800cbc9818e7c976f63499795a378cd8d)
> Signed-off-by: Günther Deschner <gd@samba.org>
Change-Id: I5aba64b26b6cbec850ea02316dd9f069400e857f
BUG: 1499889
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'xlators')
-rw-r--r-- | xlators/performance/md-cache/src/md-cache.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c index d21a6a7953c..71fcabab271 100644 --- a/xlators/performance/md-cache/src/md-cache.c +++ b/xlators/performance/md-cache/src/md-cache.c @@ -2891,7 +2891,10 @@ reconfigure (xlator_t *this, dict_t *options) GF_OPTION_RECONF ("cache-posix-acl", conf->cache_posix_acl, options, bool, out); mdc_key_load_set (mdc_keys, "system.posix_acl_", conf->cache_posix_acl); - mdc_key_load_set (mdc_keys, "glusterfs.posix_acl.", conf->cache_posix_acl); + mdc_key_load_set (mdc_keys, GF_POSIX_ACL_ACCESS, + conf->cache_posix_acl); + mdc_key_load_set (mdc_keys, GF_POSIX_ACL_DEFAULT, + conf->cache_posix_acl); GF_OPTION_RECONF ("cache-swift-metadata", conf->cache_swift_metadata, options, bool, out); @@ -2962,7 +2965,10 @@ init (xlator_t *this) GF_OPTION_INIT ("cache-posix-acl", conf->cache_posix_acl, bool, out); mdc_key_load_set (mdc_keys, "system.posix_acl_", conf->cache_posix_acl); - mdc_key_load_set (mdc_keys, "glusterfs.posix_acl.", conf->cache_posix_acl); + mdc_key_load_set (mdc_keys, GF_POSIX_ACL_ACCESS, + conf->cache_posix_acl); + mdc_key_load_set (mdc_keys, GF_POSIX_ACL_DEFAULT, + conf->cache_posix_acl); GF_OPTION_INIT ("cache-swift-metadata", conf->cache_swift_metadata, bool, out); |