summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:50:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:50:09 -0700
commit7c34691abe23741bfc7d2514efd5a39f0e0ecb06 (patch)
treef5c673eda066f4d7870d502d52d705b629eb8c03 /net
parent5f87e54d7d6f58e8f15819cf8901860d9512e8b4 (diff)
parentcfbc0683af235106e7dabe92003870b82ad6f0ba (diff)
downloadlinux-3.10-7c34691abe23741bfc7d2514efd5a39f0e0ecb06.tar.gz
linux-3.10-7c34691abe23741bfc7d2514efd5a39f0e0ecb06.tar.bz2
linux-3.10-7c34691abe23741bfc7d2514efd5a39f0e0ecb06.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: ensure bdi_unregister is called on mount failure. NFS: Avoid a deadlock in nfs_release_page NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() nfs4: Make the v4 callback service hidden nfs: fix unlikely memory leak rpc client can not deal with ENOSOCK, so translate it into ENOCONN
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtsock.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 75ab08eac66..e4839c07c91 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -548,8 +548,6 @@ static int xs_udp_send_request(struct rpc_task *task)
/* Still some bytes left; set up for a retry later. */
status = -EAGAIN;
}
- if (!transport->sock)
- goto out;
switch (status) {
case -ENOTSOCK:
@@ -569,7 +567,7 @@ static int xs_udp_send_request(struct rpc_task *task)
* prompts ECONNREFUSED. */
clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);
}
-out:
+
return status;
}
@@ -651,8 +649,6 @@ static int xs_tcp_send_request(struct rpc_task *task)
status = -EAGAIN;
break;
}
- if (!transport->sock)
- goto out;
switch (status) {
case -ENOTSOCK:
@@ -672,7 +668,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
case -ENOTCONN:
clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags);
}
-out:
+
return status;
}