summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2018-05-16 18:15:02 +0530
committerjiffin tony Thottan <jthottan@redhat.com>2018-07-04 04:02:48 +0000
commit335f6e8be4a556095c0ac1aecbc43b8e85741fdb (patch)
tree78c3675c485c389a5b46ce2e5f040006c1bfd27a
parent15a5367925a4ce828ddca874d779ce6c71e16a92 (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 BUG: 1579673 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 9e7e12a51ca..2ccba998382 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -757,9 +757,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 3cf3cf421de..9b8e2741a1a 100644
--- a/xlators/cluster/dht/src/dht-inode-read.c
+++ b/xlators/cluster/dht/src/dht-inode-read.c
@@ -79,7 +79,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 */