diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 16:01:51 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 16:01:51 -0500 |
| commit | 0b08b07507d5ae733408fd4ebda1cd89d3a840ef (patch) | |
| tree | c91d8b77610f640cd930f62407b9fc5fec283773 /net/sunrpc/xprt.c | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| parent | 1185a552e3d78807031f4021c5edb60d3e8838f1 (diff) | |
| download | op-kernel-dev-0b08b07507d5ae733408fd4ebda1cd89d3a840ef.zip op-kernel-dev-0b08b07507d5ae733408fd4ebda1cd89d3a840ef.tar.gz | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index fd46d42..469de29 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -700,6 +700,10 @@ void xprt_connect(struct rpc_task *task) } if (!xprt_lock_write(xprt, task)) return; + + if (test_and_clear_bit(XPRT_CLOSE_WAIT, &xprt->state)) + xprt->ops->close(xprt); + if (xprt_connected(xprt)) xprt_release_write(xprt, task); else { |
