diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-03-31 18:09:25 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-10 11:08:24 +0000 |
| commit | fcb55d54a62c8d4a2e8ce4596cd462c471f74dd3 (patch) | |
| tree | bc6199009fc92c36517560c07194eddac747cfe9 /xlators/cluster/ec/src/ec-combine.c | |
| parent | 169875397d99bd4357f904468288865723b9fa3a (diff) | |
| download | glusterfs-fcb55d54a62c8d4a2e8ce4596cd462c471f74dd3.tar.gz glusterfs-fcb55d54a62c8d4a2e8ce4596cd462c471f74dd3.tar.xz glusterfs-fcb55d54a62c8d4a2e8ce4596cd462c471f74dd3.zip | |
cluster/ec: Ignore volume-mark key for comparing dicts
Change-Id: Id60107e9fb96588d24fa2f3be85c764b7f08e3d1
BUG: 1207712
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/10077
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Diffstat (limited to 'xlators/cluster/ec/src/ec-combine.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-combine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index de9a995117..5f5d97275b 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -192,6 +192,7 @@ int32_t ec_dict_data_compare(dict_t * dict, char * key, data_t * value, (strncmp(key, EC_QUOTA_PREFIX, strlen(EC_QUOTA_PREFIX)) == 0) || (fnmatch(GF_XATTR_STIME_PATTERN, key, 0) == 0) || (fnmatch(MARKER_XATTR_PREFIX ".*." XTIME, key, 0) == 0) || + (fnmatch(GF_XATTR_MARKER_KEY ".*", key, 0) == 0) || (XATTR_IS_NODE_UUID(key))) { return 0; |