summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2018-05-16 18:15:02 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2018-05-22 10:27:57 +0000
commit06fa5aff8de34a13db0e054800578cf8a45df152 (patch)
tree5bd8353c55100dabe4b2a0e0efe8ed687467fbc6
parentc4029bb820bf695ff63b67a49a127633c34acb27 (diff)
cluster/dht: Remove EIO from dht_inode_missing
Removed EIO from the list of errnos that triggered a migrate check task. (cherry picked from commit c925962b91c67c8cd2391df7dd0251e0cbf66648) Change-Id: I7f89c7a16056421588f1af2377cebe6affddcb47 fixes: bz#1579674 Signed-off-by: N Balachandran <nbalacha@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-common.h4
-rw-r--r--xlators/cluster/dht/src/dht-inode-read.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index 87f60ca..86c810b 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -781,9 +781,7 @@ typedef struct dht_fd_ctx {
} \
} while (0)
-#define dht_inode_missing(op_errno) (op_errno == ENOENT || op_errno == ESTALE \
- || op_errno == EIO) \
-/*Bad fix. Please revert the commit after fixing the bug 1329505*/
+#define dht_inode_missing(op_errno) (op_errno == ENOENT || op_errno == ESTALE)
#define check_is_dir(i,s,x) (IA_ISDIR(s->ia_type))
diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c
index d1895eb..7e4aef4 100644
--- a/xlators/cluster/dht/src/dht-inode-read.c
+++ b/xlators/cluster/dht/src/dht-inode-read.c
@@ -78,7 +78,7 @@ dht_open2 (xlator_t *this, xlator_t *subvol, call_frame_t *frame, int ret)
goto out;
local = frame->local;
- op_errno = ENOENT;
+ op_errno = local->op_errno;
if (we_are_not_migrating (ret)) {
/* This DHT layer is not migrating the file */