diff options
| -rw-r--r-- | xlators/protocol/server/src/server-resolve.c | 24 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 10 |
2 files changed, 12 insertions, 22 deletions
diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c index c98c1ae5529..12eda6b5e0d 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/server/src/server-resolve.c @@ -235,27 +235,18 @@ resolve_entry_simple (call_frame_t *frame) server_resolve_t *resolve = NULL; inode_t *parent = NULL; inode_t *inode = NULL; - int missing_gfid_estale = 0; int ret = 0; state = CALL_STATE (frame); this = frame->this; resolve = state->resolve_now; - if (dict_get_int32 (state->xdata, "missing-gfid-ESTALE", - &missing_gfid_estale)) - gf_log (this->name, GF_LOG_DEBUG, - "missing-gfid-ESTALE key not present in dict"); - parent = inode_find (state->itable, resolve->pargfid); if (!parent) { /* simple resolution is indecisive. need to perform deep resolution */ resolve->op_ret = -1; - if (missing_gfid_estale) - resolve->op_errno = ESTALE; - else - resolve->op_errno = ENOENT; + resolve->op_errno = ESTALE; ret = 1; goto out; } @@ -341,28 +332,17 @@ int resolve_inode_simple (call_frame_t *frame) { server_state_t *state = NULL; - xlator_t *this = NULL; server_resolve_t *resolve = NULL; inode_t *inode = NULL; - int missing_gfid_estale = 0; int ret = 0; state = CALL_STATE (frame); - this = frame->this; resolve = state->resolve_now; - if (dict_get_int32 (state->xdata, "missing-gfid-ESTALE", - &missing_gfid_estale)) - gf_log (this->name, GF_LOG_DEBUG, - "missing-gfid-ESTALE key not present in dict"); - inode = inode_find (state->itable, resolve->gfid); if (!inode) { resolve->op_ret = -1; - if (missing_gfid_estale) - resolve->op_errno = ESTALE; - else - resolve->op_errno = ENOENT; + resolve->op_errno = ESTALE; ret = 1; goto out; } diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index e67d168d84d..d69d51f4d08 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -3013,8 +3013,15 @@ int server_lookup_resume (call_frame_t *frame, xlator_t *bound_xl) { server_state_t *state = NULL; + xlator_t *this = NULL; + int missing_gfid_estale = 0; state = CALL_STATE (frame); + this = frame->this; + if (dict_get_int32 (state->xdata, "missing-gfid-ESTALE", + &missing_gfid_estale)) + gf_log (this->name, GF_LOG_DEBUG, + "missing-gfid-ESTALE key not present in dict"); if (state->resolve.op_ret != 0) goto err; @@ -3030,6 +3037,9 @@ server_lookup_resume (call_frame_t *frame, xlator_t *bound_xl) return 0; err: + + if ((state->resolve.op_errno == ESTALE) && !missing_gfid_estale) + state->resolve.op_errno = ENOENT; server_lookup_cbk (frame, NULL, frame->this, state->resolve.op_ret, state->resolve.op_errno, NULL, NULL, NULL, NULL); |