From d4c415776b20e4152d4a706276cb06d833a58baa Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Sat, 19 Dec 2015 20:27:17 -0500 Subject: all: fixes for clang compile warnings cli/src/cli-cmd-parser.c (chenk) cli/src/cli-xml-output.c (spandit) cli/src/cli.c (chenk) libglusterfs/src/common-utils.c (vmallika) libglusterfs/src/gfdb/gfdb_sqlite3.c (jfernand +1) rpc/rpc-transport/socket/src/socket.c (?) xlators/cluster/afr/src/afr-transaction.c (?) xlators/cluster/dht/src/dht-common.h (srangana +2) xlators/cluster/dht/src/dht-selfheal.c (srangana +2) xlators/debug/io-stats/src/io-stats.c (R. Wareing) xlators/features/barrier/src/barrier.c (vshastry) xlators/features/bit-rot/src/bitd/bit-rot-scrub.h (vshankar +1) xlators/features/shard/src/shard.c (kdhananj +1) xlators/mgmt/glusterd/src/glusterd-ganesha.c (skoduri) xlators/mgmt/glusterd/src/glusterd-handler.c (atinmu) xlators/mgmt/glusterd/src/glusterd-op-sm.h (atinmu) xlators/mgmt/glusterd/src/glusterd-snapshot.c (spandit) xlators/mgmt/glusterd/src/glusterd-syncop.c (atinmu) xlators/mgmt/glusterd/src/glusterd-volgen.c (atinmu) xlators/protocol/client/src/client-messages.h (mselvaga +1) xlators/storage/bd/src/bd-helper.c (M. Mohan Kumar) xlators/storage/bd/src/bd.c (M. Mohan Kumar) xlators/storage/posix/src/posix.c (nbalacha +1) Change-Id: I85934fbcaf485932136ef3acd206f6ebecde61dd BUG: 1293133 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/13031 CentOS-regression: Gluster Build System Smoke: Gluster Build System NetBSD-regression: NetBSD Build System --- xlators/cluster/dht/src/dht-common.h | 2 +- xlators/cluster/dht/src/dht-selfheal.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'xlators/cluster/dht') diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 22855b9425c..d9b52e28bb9 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -441,7 +441,7 @@ struct dht_conf { int *last_event; dht_layout_t **file_layouts; dht_layout_t **dir_layouts; - gf_boolean_t search_unhashed; + unsigned int search_unhashed; gf_boolean_t lookup_optimize; int gen; dht_du_t *du_stats; diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index d7ee74224c6..1eef4bdb59e 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -442,7 +442,9 @@ dht_distribution_type (xlator_t *this, dht_layout_t *layout) } range = layout->list[i].stop - layout->list[i].start; - diff = abs (range - start_range); + diff = (range >= start_range) + ? range - start_range + : start_range - range; if ((range != 0) && (diff > layout->cnt)) { type = GF_DHT_WEIGHTED_DISTRIBUTION; -- cgit