diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-18 03:13:00 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-19 03:13:44 +0200 |
| commit | 1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81 (patch) | |
| tree | 143956f878290e85de7c9130f465e862f587ee53 /net | |
| parent | Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31 (diff) | |
| parent | nfs: remove unnecessary NFS_INO_INVALID_ACL checks (diff) | |
| download | linux-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.tar.xz linux-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.zip | |
Merge branch 'devel-for-2.6.31' into for-2.6.31
Conflicts:
fs/nfs/client.c
fs/nfs/super.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 9111d11c09fd..83c73c4d017a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1965,6 +1965,7 @@ static void xs_tcp_setup_socket(struct rpc_xprt *xprt, */ set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); xprt_force_disconnect(xprt); + break; case -ECONNREFUSED: case -ECONNRESET: case -ENETUNREACH: |