diff options
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 259d31a4a8c..95a9d6c4cee 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -3582,7 +3582,7 @@ dht_setxattr2 (xlator_t *this, xlator_t *subvol, call_frame_t *frame) return 0; err: - DHT_STACK_UNWIND (setxattr, frame, local->op_ret, op_errno, NULL); + DHT_STACK_UNWIND (setxattr, frame, local ? local->op_ret : -1, op_errno, NULL); return 0; } @@ -4425,7 +4425,9 @@ dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, goto err; } - if (!(conf->local_subvols_cnt) || !conf->defrag) { + if ((conf->defrag && conf->defrag->cmd == GF_DEFRAG_CMD_START_TIER) || + (conf->defrag && conf->defrag->cmd == GF_DEFRAG_CMD_START_DETACH_TIER) || + (!(conf->local_subvols_cnt) || !conf->defrag)) { local->call_cnt = conf->subvolume_cnt; for (i = 0; i < conf->subvolume_cnt; i++) { |