From 6e4e21c689c2e4b96a564afb2f0a3972e7829a53 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 6 Nov 2014 10:37:06 +0530 Subject: features/marker: Filter internal xattrs in lookup Backport of http://review.gluster.com/9061 Afr should ignore quota-size-key as part of self-heal but should heal quota-limit key. BUG: 1162230 Change-Id: I639cfabbc44468da29914096afc7e2eca1ff1292 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/9091 Tested-by: Gluster Build System Reviewed-by: Ravishankar N Reviewed-by: Raghavendra G Reviewed-by: Krutika Dhananjay Reviewed-by: Niels de Vos --- libglusterfs/src/dict.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ libglusterfs/src/dict.h | 13 +++++++++++++ 2 files changed, 58 insertions(+) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c index 065990b42ef..f690b29b74f 100644 --- a/libglusterfs/src/dict.c +++ b/libglusterfs/src/dict.c @@ -1129,6 +1129,51 @@ dict_foreach (dict_t *dict, return 0; } +/* return values: + -1 = failure, + 0 = no matches found, + +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, diff --git a/libglusterfs/src/dict.h b/libglusterfs/src/dict.h index a92fd2cb61a..5f9e66e51f7 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, -- cgit