diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 21:13:00 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-18 21:13:44 -0400 |
| commit | 1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81 (patch) | |
| tree | 143956f878290e85de7c9130f465e862f587ee53 /net | |
| parent | 301933a0acfdec837fd8b4884093b3f0fff01d8a (diff) | |
| parent | 4bf259e3ae5015e73282ba66716c4a917e1264ac (diff) | |
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, | |||
| 1965 | */ | 1965 | */ |
| 1966 | set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); | 1966 | set_bit(XPRT_CONNECTION_CLOSE, &xprt->state); |
| 1967 | xprt_force_disconnect(xprt); | 1967 | xprt_force_disconnect(xprt); |
| 1968 | break; | ||
| 1968 | case -ECONNREFUSED: | 1969 | case -ECONNREFUSED: |
| 1969 | case -ECONNRESET: | 1970 | case -ECONNRESET: |
| 1970 | case -ENETUNREACH: | 1971 | case -ENETUNREACH: |