summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src
diff options
context:
space:
mode:
authorHarshavardhana <fharshav@redhat.com>2012-01-03 16:05:51 -0800
committerVijay Bellur <vijay@gluster.com>2012-01-12 21:47:06 -0800
commitfaf9099bb50d4d2c1a9fe8d3232d541b3f68bc58 (patch)
tree3276d9f6b7dfd6724d40db75c36ec0d7634b09aa /xlators/cluster/dht/src
parent718a2744076ff21d19c0e9b2cadac5b975a3f6a9 (diff)
cluster/distribute: dht_aggregate() fix a logic error before xattr comparisons
Change-Id: I20f015263bed9851225005d5f41a5d518bd22592 BUG: 769691 Signed-off-by: Harshavardhana <fharshav@redhat.com> Reviewed-on: http://review.gluster.com/2557 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amar@gluster.com>
Diffstat (limited to 'xlators/cluster/dht/src')
-rw-r--r--xlators/cluster/dht/src/dht-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index fb149e763..16bb2c9cc 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -75,7 +75,7 @@ dht_aggregate (dict_t *this, char *key, data_t *value, void *data)
/* compare user xattrs only */
if (!strncmp (key, "user.", strlen ("user."))) {
ret = dict_lookup (dst, key, &data_pair);
- if (!ret && data) {
+ if (!ret && data_pair && value) {
ret = is_data_equal (data_pair->value, value);
if (!ret)
gf_log ("dht", GF_LOG_WARNING,