diff options
| -rw-r--r-- | libglusterfs/src/dict.c | 45 | ||||
| -rw-r--r-- | libglusterfs/src/dict.h | 13 | ||||
| -rw-r--r-- | tests/bugs/afr-quota-xattr-mdata-heal.t | 138 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 6 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 19 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 3 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.c | 109 |
7 files changed, 294 insertions, 39 deletions
diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index d55495c1ad2..4b35fa8dd3c 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -1140,6 +1140,51 @@ dict_foreach (dict_t *dict, +n = n number of matches */ int +dict_foreach_match (dict_t *dict, + gf_boolean_t (*match)(dict_t *this, + char *key, + data_t *value, + void *mdata), + void *match_data, + int (*action)(dict_t *this, + char *key, + data_t *value, + void *adata), + void *action_data) +{ + if (!dict || !match || !action) { + gf_log_callingfn ("dict", GF_LOG_WARNING, + "dict|match|action is NULL"); + return -1; + } + + int ret = -1; + int count = 0; + data_pair_t *pairs = NULL; + data_pair_t *next = NULL; + + pairs = dict->members_list; + while (pairs) { + next = pairs->next; + if (match (dict, pairs->key, pairs->value, match_data)) { + ret = action (dict, pairs->key, pairs->value, + action_data); + if (ret < 0) + return ret; + count++; + } + pairs = next; + } + + return count; +} + +/* return values: + -1 = failure, + 0 = no matches found, + +n = n number of matches +*/ +int dict_foreach_fnmatch (dict_t *dict, char *pattern, int (*fn)(dict_t *this, char *key, diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h index 148eb0ef7ea..66a900131d1 100644 --- a/libglusterfs/src/dict.h +++ b/libglusterfs/src/dict.h @@ -177,6 +177,19 @@ int dict_foreach_fnmatch (dict_t *dict, char *pattern, void *data), void *data); +int +dict_foreach_match (dict_t *dict, + gf_boolean_t (*match)(dict_t *this, + char *key, + data_t *value, + void *mdata), + void *match_data, + int (*action)(dict_t *this, + char *key, + data_t *value, + void *adata), + void *action_data); + int dict_null_foreach_fn (dict_t *d, char *k, data_t *v, void *tmp); int dict_remove_foreach_fn (dict_t *d, char *k, diff --git a/tests/bugs/afr-quota-xattr-mdata-heal.t b/tests/bugs/afr-quota-xattr-mdata-heal.t new file mode 100644 index 00000000000..5291c464581 --- /dev/null +++ b/tests/bugs/afr-quota-xattr-mdata-heal.t @@ -0,0 +1,138 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +cleanup; +TEST glusterd +TEST pidof glusterd +TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} +TEST $CLI volume start $V0 +TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 +TEST $CLI volume quota $V0 enable +TEST $CLI volume quota $V0 limit-usage / 1MB +TEST mkdir $M0/d +TEST $CLI volume quota $V0 limit-usage /d 1MB +TEST touch $M0/d/a +echo abc > $M0/d/a +#Set the acl xattrs directly on backend, for some reason on mount it gives error +acl_access_val="0x0200000001000600ffffffff04000400ffffffff10000400ffffffff20000400ffffffff" +acl_file_val="0x0000000400000001ffffffff0006000000000004ffffffff0004000000000010ffffffff0004000000000020ffffffff00040000" +TEST setfattr -n system.posix_acl_access -v $acl_access_val $B0/${V0}0/d +TEST setfattr -n trusted.SGI_ACL_FILE -v $acl_file_val $B0/${V0}0/d +TEST setfattr -n system.posix_acl_access -v $acl_access_val $B0/${V0}1/d +TEST setfattr -n trusted.SGI_ACL_FILE -v $acl_file_val $B0/${V0}1/d +TEST setfattr -n trusted.foo -v "baz" $M0/d +TEST setfattr -n trusted.foo -v "baz" $M0/d/a +TEST setfattr -n trusted.foo1 -v "baz1" $M0/d +TEST setfattr -n trusted.foo1 -v "baz1" $M0/d/a +TEST setfattr -n trusted.foo3 -v "unchanged" $M0/d +TEST setfattr -n trusted.foo3 -v "unchanged" $M0/d/a + +TEST kill_brick $V0 $H0 $B0/${V0}0 +#Induce metadata self-heal +TEST setfattr -n trusted.foo -v "bar" $M0/d +TEST setfattr -n trusted.foo -v "bar" $M0/d/a +TEST setfattr -x trusted.foo1 $M0/d +TEST setfattr -x trusted.foo1 $M0/d/a +TEST setfattr -n trusted.foo2 -v "bar2" $M0/d +TEST setfattr -n trusted.foo2 -v "bar2" $M0/d/a +d_quota_contri=$(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.*.contri") +d_quota_dirty=$(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.dirty") +d_quota_limit=$(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.limit-set") +d_quota_size=$(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.size") + +a_pgfid=$(getfattr -d -m . -e hex $B0/${V0}1/d/a | grep -E "trusted.pgfid.") + +#Change internal xattrs in the backend, later check that they are not healed +TEST setfattr -n trusted.glusterfs.quota.00000000-0000-0000-0000-000000000001.contri -v 0x0000000000000400 $B0/${V0}0/d +TEST setfattr -n trusted.glusterfs.quota.dirty -v 0x0000000000000400 $B0/${V0}0/d +TEST setfattr -n trusted.glusterfs.quota.limit-set -v 0x0000000000000400 $B0/${V0}0/d #This will be healed, this is external xattr +TEST setfattr -n trusted.glusterfs.quota.size -v 0x0000000000000400 $B0/${V0}0/d +TEST setfattr -n $(echo $a_pgfid | cut -f1 -d'=') -v "orphan" $B0/${V0}0/d/a + +TEST $CLI volume set $V0 cluster.self-heal-daemon on +TEST $CLI volume start $V0 force +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 +EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0 + +#Check external xattrs match +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo) +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo) +TEST ! getfattr -n trusted.foo1 $B0/${V0}0/d +TEST ! getfattr -n trusted.foo1 $B0/${V0}0/d/a +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo3) +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo3) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo2) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo2) +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}0/d | grep "trusted.glusterfs.quota.limit-set") + +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo) +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo) +TEST ! getfattr -n trusted.foo1 $B0/${V0}1/d +TEST ! getfattr -n trusted.foo1 $B0/${V0}1/d/a +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo3) +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo3) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo2) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo2) +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep "trusted.glusterfs.quota.limit-set") + +#Test that internal xattrs on B0 are not healed +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.00000000-0000-0000-0000-000000000001.contri) +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.dirty) +EXPECT "$d_quota_limit" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.limit-set) #This will be healed, this is external xattr +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.size) +EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep system.posix_acl_access) +EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.SGI_ACL_FILE) +EXPECT "orphan" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep $(echo $a_pgfid | cut -f1 -d'=')) + +#Test that xattrs didn't go bad in source +EXPECT "$d_quota_contri" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.*.contri") +EXPECT "$d_quota_dirty" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.dirty") +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.limit-set") +EXPECT "$d_quota_size" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.size") +EXPECT "$a_pgfid" echo $(getfattr -d -m . -e hex $B0/${V0}1/d/a | grep -E "trusted.pgfid.") +EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep system.posix_acl_access) +EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep trusted.SGI_ACL_FILE) + +#Do a lookup and it shouldn't trigger metadata self-heal and heal xattrs +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo) +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo) +TEST ! getfattr -n trusted.foo1 $B0/${V0}0/d +TEST ! getfattr -n trusted.foo1 $B0/${V0}0/d/a +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo3) +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo3) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}0/d | grep trusted.foo2) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep trusted.foo2) +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}0/d | grep "trusted.glusterfs.quota.limit-set") + +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo) +EXPECT "bar" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo) +TEST ! getfattr -n trusted.foo1 $B0/${V0}1/d +TEST ! getfattr -n trusted.foo1 $B0/${V0}1/d/a +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo3) +EXPECT "unchanged" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo3) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}1/d | grep trusted.foo2) +EXPECT "bar2" echo $(getfattr -d -m. -e text $B0/${V0}1/d/a | grep trusted.foo2) +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep "trusted.glusterfs.quota.limit-set") + +#Test that internal xattrs on B0 are not healed +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.00000000-0000-0000-0000-000000000001.contri) +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.dirty) +EXPECT "$d_quota_limit" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.limit-set) #This will be healed, this is external xattr +EXPECT 0x0000000000000400 echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.glusterfs.quota.size) +EXPECT "orphan" echo $(getfattr -d -m. -e text $B0/${V0}0/d/a | grep $(echo $a_pgfid | cut -f1 -d'=')) + +#Test that xattrs didn't go bad in source +EXPECT "$d_quota_contri" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.*.contri") +EXPECT "$d_quota_dirty" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.dirty") +EXPECT "$d_quota_limit" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.limit-set") +EXPECT "$d_quota_size" echo $(getfattr -d -m . -e hex $B0/${V0}1/d | grep -E "trusted.glusterfs.quota.size") +EXPECT "$a_pgfid" echo $(getfattr -d -m . -e hex $B0/${V0}1/d/a | grep -E "trusted.pgfid.") + +EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep system.posix_acl_access) +EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.SGI_ACL_FILE) +EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep system.posix_acl_access) +EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep trusted.SGI_ACL_FILE) +cleanup diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 42ff70937ac..1527a47f716 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1156,8 +1156,8 @@ static char *afr_ignore_xattrs[] = { NULL }; -static gf_boolean_t -afr_lookup_xattr_ignorable (char *key) +gf_boolean_t +afr_is_xattr_ignorable (char *key) { int i = 0; @@ -1176,7 +1176,7 @@ xattr_is_equal (dict_t *this, char *key1, data_t *value1, void *data) dict_t *xattr2 = (dict_t *)data; data_t *value2 = NULL; - if (afr_lookup_xattr_ignorable (key1)) + if (afr_is_xattr_ignorable (key1)) return 0; value2 = dict_get (xattr2, key1); diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 96b3262e471..dced4d07df6 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -20,6 +20,19 @@ #define AFR_HEAL_ATTR (GF_SET_ATTR_UID|GF_SET_ATTR_GID|GF_SET_ATTR_MODE) +static gf_boolean_t +_afr_ignorable_key_match (dict_t *d, char *k, data_t *val, void *mdata) +{ + return afr_is_xattr_ignorable (k); +} + +void +afr_delete_ignorable_xattrs (dict_t *xattr) +{ + dict_foreach_match (xattr, _afr_ignorable_key_match, NULL, + dict_remove_foreach_fn, NULL); +} + int __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, int source, unsigned char *healed_sinks, @@ -46,8 +59,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, goto out; } - afr_filter_xattrs (xattr); - dict_del (xattr, GF_SELINUX_XATTR_KEY); + afr_delete_ignorable_xattrs (xattr); for (i = 0; i < priv->child_count; i++) { if (old_xattr) { @@ -66,8 +78,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, ret = syncop_getxattr (priv->children[i], &loc, &old_xattr, 0); if (old_xattr) { - dict_del (old_xattr, GF_SELINUX_XATTR_KEY); - afr_filter_xattrs (old_xattr); + afr_delete_ignorable_xattrs (old_xattr); ret = syncop_removexattr (priv->children[i], &loc, "", old_xattr); } diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 2b0ced58f6c..51e57e8207f 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -1008,4 +1008,7 @@ afr_replies_wipe (struct afr_reply *replies, int count); gf_boolean_t afr_xattrs_are_equal (dict_t *dict1, dict_t *dict2); + +gf_boolean_t +afr_is_xattr_ignorable (char *key); #endif /* __AFR_H__ */ diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index b037844e855..99e8d59032d 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -23,8 +23,16 @@ #include "byte-order.h" #include "syncop.h" +#include <fnmatch.h> + #define _GF_UID_GID_CHANGED 1 +static char *quota_external_xattrs[] = { + QUOTA_SIZE_KEY, + QUOTA_LIMIT_KEY, + NULL, +}; + void fini (xlator_t *this); @@ -278,17 +286,51 @@ out: return is_true; } +static gf_boolean_t +_is_quota_internal_xattr (dict_t *d, char *k, data_t *v, void *data) +{ + int i = 0; + char **external_xattrs = data; + + for (i = 0; external_xattrs && external_xattrs[i]; i++) { + if (strcmp (k, external_xattrs[i]) == 0) + return _gf_false; + } + + if (fnmatch ("trusted.glusterfs.quota*", k, 0) == 0) + return _gf_true; + + /* It would be nice if posix filters pgfid xattrs. But since marker + * also takes up responsibility to clean these up, adding the filtering + * here (Check 'quota_xattr_cleaner') + */ + if (fnmatch (PGFID_XATTR_KEY_PREFIX"*", k, 0) == 0) + return _gf_true; + + return _gf_false; +} + +static void +marker_filter_internal_xattrs (xlator_t *this, dict_t *xattrs) +{ + marker_conf_t *priv = NULL; + char **ext = NULL; + + priv = this->private; + if (priv->feature_enabled & GF_QUOTA) + ext = quota_external_xattrs; + + dict_foreach_match (xattrs, _is_quota_internal_xattr, ext, + dict_remove_foreach_fn, NULL); + return; +} + int32_t marker_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, dict_t *dict, dict_t *xdata) { - int ret = 0; - char *src = NULL; - char *dst = NULL; - int len = 0; marker_local_t *local = NULL; - local = frame->local; @@ -308,37 +350,15 @@ marker_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, is changed. So let that xattr be healed by other xlators properly whenever directory healing is done. */ - ret = dict_get_ptr_and_len (dict, QUOTA_LIMIT_KEY, - (void **)&src, &len); - if (ret) { - gf_log (this->name, GF_LOG_DEBUG, "dict_get on %s " - "failed", QUOTA_LIMIT_KEY); - } else { - dst = GF_CALLOC (len, sizeof (char), gf_common_mt_char); - if (dst) - memcpy (dst, src, len); - } - /* * Except limit-set xattr, rest of the xattrs are maintained * by quota xlator. Don't expose them to other xlators. * This filter makes sure quota xattrs are not healed as part of * metadata self-heal */ - GF_REMOVE_INTERNAL_XATTR ("trusted.glusterfs.quota*", dict); - if (!ret && IA_ISDIR (local->loc.inode->ia_type) && dst) { - ret = dict_set_dynptr (dict, QUOTA_LIMIT_KEY, - dst, len); - if (ret) - gf_log (this->name, GF_LOG_WARNING, "setting " - "key %s failed", QUOTA_LIMIT_KEY); - else - dst = NULL; - } + marker_filter_internal_xattrs (frame->this, dict); } - GF_FREE (dst); - frame->local = NULL; STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict, xdata); marker_local_unref (local); @@ -2593,6 +2613,15 @@ err: return 0; } +static gf_boolean_t +__has_quota_xattrs (dict_t *xattrs) +{ + if (dict_foreach_match (xattrs, _is_quota_internal_xattr, NULL, + dict_null_foreach_fn, NULL) > 0) + return _gf_true; + + return _gf_false; +} int32_t marker_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, @@ -2601,18 +2630,32 @@ marker_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, { marker_conf_t *priv = NULL; marker_local_t *local = NULL; + dict_t *xattrs = NULL; + priv = this->private; if (op_ret == -1) { gf_log (this->name, GF_LOG_TRACE, "lookup failed with %s", strerror (op_errno)); } + if (dict && __has_quota_xattrs (dict)) { + xattrs = dict_copy_with_ref (dict, NULL); + if (!xattrs) { + op_ret = -1; + op_errno = ENOMEM; + } else { + marker_filter_internal_xattrs (this, xattrs); + } + } else if (dict) { + xattrs = dict_ref (dict); + } + local = (marker_local_t *) frame->local; frame->local = NULL; STACK_UNWIND_STRICT (lookup, frame, op_ret, op_errno, inode, buf, - dict, postparent); + xattrs, postparent); if (op_ret == -1 || local == NULL) goto out; @@ -2626,14 +2669,14 @@ marker_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, uuid_copy (local->loc.gfid, buf->ia_gfid); - priv = this->private; - if (priv->feature_enabled & GF_QUOTA) { mq_xattr_state (this, &local->loc, dict, *buf); } out: marker_local_unref (local); + if (xattrs) + dict_unref (xattrs); return 0; } @@ -2652,6 +2695,8 @@ marker_lookup (call_frame_t *frame, xlator_t *this, goto wind; local = mem_get0 (this->local_pool); + if (local == NULL) + goto err; MARKER_INIT_LOCAL (frame, local); @@ -2666,7 +2711,7 @@ wind: FIRST_CHILD(this)->fops->lookup, loc, xattr_req); return 0; err: - STACK_UNWIND_STRICT (lookup, frame, -1, 0, NULL, NULL, NULL, NULL); + STACK_UNWIND_STRICT (lookup, frame, -1, ENOMEM, NULL, NULL, NULL, NULL); return 0; } |