summaryrefslogtreecommitdiffstats
path: root/xlators/storage/posix/src/posix-helpers.c
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2017-06-19 13:45:55 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2017-06-19 10:17:08 +0000
commit61924b98a61108a7ec453fb7f1fc5487d1386e56 (patch)
tree008a968eaeb0d09a16e89bdb8cc8c082c41e6102 /xlators/storage/posix/src/posix-helpers.c
parent3011af67734ac1ef0e73775dc265483f2c5dea91 (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. Change-Id: Idcf5c65a47b096a3766cf7f20ca938d988572052 BUG: 1456582 Signed-off-by: Ravishankar N <ravishankar@redhat.com> 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>
Diffstat (limited to 'xlators/storage/posix/src/posix-helpers.c')
-rw-r--r--xlators/storage/posix/src/posix-helpers.c16
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 9e4ab5e..8457905 100644
--- a/xlators/storage/posix/src/posix-helpers.c
+++ b/xlators/storage/posix/src/posix-helpers.c
@@ -1685,13 +1685,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;
@@ -1712,13 +1710,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;