|
|
21ab4e |
From 681d103e9b9639899026e753d0c9022aaa41470b Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
Date: Thu, 13 Apr 2017 16:44:44 +0530
|
|
|
21ab4e |
Subject: [PATCH 381/393] dht: Add missing braces in dht_opendir
|
|
|
21ab4e |
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/17057
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
|
|
|
21ab4e |
> Signed-off-by: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I6adce98f52e17953f501bc590ff7189cceac3c31
|
|
|
21ab4e |
BUG: 1427096
|
|
|
21ab4e |
Signed-off-by: Poornima G <pgurusid@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/103635
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/cluster/dht/src/dht-common.c | 3 ++-
|
|
|
21ab4e |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
21ab4e |
index 9533940..1235467 100644
|
|
|
21ab4e |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
21ab4e |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
21ab4e |
@@ -4902,7 +4902,7 @@ dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd,
|
|
|
21ab4e |
|
|
|
21ab4e |
for (i = 0; i < call_count; i++) {
|
|
|
21ab4e |
if (conf->readdir_optimize == _gf_true) {
|
|
|
21ab4e |
- if (subvolumes[i] != local->first_up_subvol)
|
|
|
21ab4e |
+ if (subvolumes[i] != local->first_up_subvol) {
|
|
|
21ab4e |
ret = dict_set_int32 (xdata,
|
|
|
21ab4e |
GF_READDIR_SKIP_DIRS, 1);
|
|
|
21ab4e |
if (ret)
|
|
|
21ab4e |
@@ -4911,6 +4911,7 @@ dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd,
|
|
|
21ab4e |
"Failed to set dictionary"
|
|
|
21ab4e |
" value :key = %s, ret:%d",
|
|
|
21ab4e |
GF_READDIR_SKIP_DIRS, ret);
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
STACK_WIND_COOKIE (frame, dht_fd_cbk,
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|