diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2017-06-19 13:45:55 +0530 |
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2017-06-20 04:53:44 +0000 |
| commit | 34b136a8b55a2518529e2bdc43de99e43868dde8 (patch) | |
| tree | 17575928389d45c493c5d4c205945cf12bd19f91 | |
| parent | 5bd806f1cdb3a975fe8f2272d47b741c05155ca1 (diff) | |
posix: Revert modifying op_errno in __posix_fd_ctx_get
https://review.gluster.org/#/c/17414/ converted ENOENT to EBADFD because
ENOENT is not a valid error for fd based operations, but this apparently
breaks dht rebalance behaviour (see comments in the backport 17517. So
reverting that part of the change.
> Reviewed-on: https://review.gluster.org/17565
> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
> Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
(cherry picked from commit 61924b98a61108a7ec453fb7f1fc5487d1386e56)
Change-Id: Idcf5c65a47b096a3766cf7f20ca938d988572052
BUG: 1457732
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: https://review.gluster.org/17571
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index d39a77bbe06..9b945c271bc 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -1695,13 +1695,11 @@ __posix_fd_ctx_get (fd_t *fd, xlator_t *this, struct posix_fd **pfd_p, if (fd->inode->ia_type == IA_IFDIR) { dir = sys_opendir (real_path); if (!dir) { - (errno == ENOENT) ? (op_errno = EBADF) : - (op_errno = errno); - gf_msg (this->name, GF_LOG_ERROR, errno, + op_errno = errno; + gf_msg (this->name, GF_LOG_ERROR, op_errno, P_MSG_READ_FAILED, "Failed to get anonymous fd for " - "real_path: %s. Returning %s.", real_path, - strerror(op_errno)); + "real_path: %s.", real_path); GF_FREE (pfd); pfd = NULL; goto out; @@ -1722,13 +1720,11 @@ __posix_fd_ctx_get (fd_t *fd, xlator_t *this, struct posix_fd **pfd_p, _fd = open (unlink_path, fd->flags); } if (_fd == -1) { - (errno == ENOENT) ? (op_errno = EBADF) : - (op_errno = errno); - gf_msg (this->name, GF_LOG_ERROR, errno, + op_errno = errno; + gf_msg (this->name, GF_LOG_ERROR, op_errno, P_MSG_READ_FAILED, "Failed to get anonymous fd for " - "real_path: %s. Returning %s.", real_path, - strerror(op_errno)); + "real_path: %s.", real_path); GF_FREE (pfd); pfd = NULL; goto out; |