summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-01-05 07:52:25 -0500
committerJeff Darcy <jdarcy@redhat.com>2016-01-05 18:07:37 -0800
commita2119ef0f18d51500f5b496caf8dfd8f192dd490 (patch)
tree03221ae9df6f35944a9d870101067ecc12540148
parent1e779acec75842b0e8d5a34ac2ea52f9caeff4d1 (diff)
dht: missleading indendentation, gcc-6
gcc-6 now has -Wmisleading-indentation as part of -Wall. compiling with gcc-6 gives this warning. ... dht-diskusage.c: In function ‘dht_subvol_has_err’: dht-diskusage.c:361:33: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation] goto out; ^~~~ dht-diskusage.c:358:25: note: ...this ‘if’ clause, but it is not if (conf->decommissioned_bricks[i] && ^~ ... Inspection of the source shows that without braces the loop is terminated prematurely. Change-Id: Ica48a8c59ee5d0a206797827d7920259d33b47ec BUG: 1295784 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/13176 Reviewed-by: N Balachandran <nbalacha@redhat.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/cluster/dht/src/dht-diskusage.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c
index b85c78a540b..1eb9e63c531 100644
--- a/xlators/cluster/dht/src/dht-diskusage.c
+++ b/xlators/cluster/dht/src/dht-diskusage.c
@@ -356,9 +356,10 @@ int32_t dht_subvol_has_err (dht_conf_t *conf, xlator_t *this,
if (conf->decommission_subvols_cnt) {
for (i = 0; i < conf->subvolume_cnt; i++) {
if (conf->decommissioned_bricks[i] &&
- conf->decommissioned_bricks[i] == this)
+ conf->decommissioned_bricks[i] == this) {
ret = -1;
goto out;
+ }
}
}