diff options
| author | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-09 05:48:50 -0800 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-09 05:48:50 -0800 |
| commit | 93845ea7ccc44b79cf2a60526e4759059382f22b (patch) | |
| tree | bec6bc5037a7aeff74bb13c3edf6b040d4873088 | |
| parent | f5d1246dd778cebc76ff88d0c9cfcc1a69169ffc (diff) | |
Revert "Eliminate syscall tight loop when handling EAGAIN in NFS."v3.1.3qa6
This reverts commit 689c1b5044e701e1b695a6e6c80647b9471ba454.
| -rw-r--r-- | xlators/nfs/lib/src/rpcsvc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/xlators/nfs/lib/src/rpcsvc.c b/xlators/nfs/lib/src/rpcsvc.c index 84ee7bc2234..515e8738fc9 100644 --- a/xlators/nfs/lib/src/rpcsvc.c +++ b/xlators/nfs/lib/src/rpcsvc.c @@ -2557,7 +2557,6 @@ tx_remaining: nfs_rpcsvc_socket_block_tx (conn->sockfd); } - errno = 0; written = nfs_rpcsvc_socket_write (conn->sockfd, writeaddr, writesize); if (txbuf->txbehave & RPCSVC_TXB_LAST) { @@ -2567,25 +2566,13 @@ tx_remaining: gf_log (GF_RPCSVC, GF_LOG_TRACE, "conn: 0x%lx, Tx request: %zu," " Tx sent: %zd", (long)conn, writesize, written); - /* - * There was an error transmitting this buffer. We are polling - * for errors. So, there is no necessity to handle closure of - * the connection explicitly here. - */ + /* There was an error transmitting this buffer */ if (written == -1) break; if (written >= 0) txbuf->offset += written; - if (errno == EAGAIN) { - /* - * Socket layer is indicating flow-control. We - * break-out now and wait for the next event indicating - * room for writes. - */ - break; - } /* If the current buffer has been completely transmitted, * delete it from the list and move on to the next buffer. */ |