diff options
| author | Günther Deschner <gd@samba.org> | 2017-10-09 17:56:27 +0200 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-10-25 14:05:54 +0000 |
| commit | 4a26ff89564a90ad10020ab64d92f1ace886caff (patch) | |
| tree | da03e30eaf457bacf36704fefea227576cc61cad | |
| parent | 115bf4332307fa0f95688dcab73341adfa7071ed (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
> Change-Id: I5aba64b26b6cbec850ea02316dd9f069400e857f
> 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: 1499890
Signed-off-by: Günther Deschner <gd@samba.org>
| -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 001012a2e46..ce253e41279 100644 --- a/xlators/performance/md-cache/src/md-cache.c +++ b/xlators/performance/md-cache/src/md-cache.c @@ -2894,7 +2894,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); @@ -2965,7 +2968,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); |