summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@dev.gluster.com>2011-03-09 05:48:22 -0800
committerVijay Bellur <vijay@dev.gluster.com>2011-03-09 05:48:22 -0800
commitf5d1246dd778cebc76ff88d0c9cfcc1a69169ffc (patch)
tree477a81e1803d206098129cf3c6ab7cc5ef857ab8
parent12254aebc39933baa8186b0fb1464bfa8eab6c3d (diff)
Revert "Make sure we are looking at the right errno in the fix for bug 2452."
This reverts commit dae57d72a58ff61fe6eda800d386bf83574ef5c2.
-rw-r--r--xlators/nfs/lib/src/rpcsvc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/xlators/nfs/lib/src/rpcsvc.c b/xlators/nfs/lib/src/rpcsvc.c
index 987c24080..84ee7bc22 100644
--- a/xlators/nfs/lib/src/rpcsvc.c
+++ b/xlators/nfs/lib/src/rpcsvc.c
@@ -2542,7 +2542,6 @@ __nfs_rpcsvc_conn_data_poll_out (rpcsvc_conn_t *conn)
ssize_t written = -1;
char *writeaddr = NULL;
size_t writesize = -1;
- int local_errno = 0;
if (!conn)
return -1;
@@ -2561,8 +2560,6 @@ tx_remaining:
errno = 0;
written = nfs_rpcsvc_socket_write (conn->sockfd, writeaddr,
writesize);
- local_errno = errno;
-
if (txbuf->txbehave & RPCSVC_TXB_LAST) {
gf_log (GF_RPCSVC, GF_LOG_TRACE, "Last Tx Buf");
nfs_rpcsvc_socket_unblock_tx (conn->sockfd);
@@ -2581,7 +2578,7 @@ tx_remaining:
if (written >= 0)
txbuf->offset += written;
- if (local_errno == EAGAIN) {
+ if (errno == EAGAIN) {
/*
* Socket layer is indicating flow-control. We
* break-out now and wait for the next event indicating