diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /net/sunrpc/xprt.c | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 269f217918a3..3c654e06b084 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
| @@ -145,8 +145,6 @@ __xprt_lock_write(struct rpc_xprt *xprt, struct rpc_task *task) | |||
| 145 | if (test_and_set_bit(XPRT_LOCKED, &xprt->sockstate)) { | 145 | if (test_and_set_bit(XPRT_LOCKED, &xprt->sockstate)) { |
| 146 | if (task == xprt->snd_task) | 146 | if (task == xprt->snd_task) |
| 147 | return 1; | 147 | return 1; |
| 148 | if (task == NULL) | ||
| 149 | return 0; | ||
| 150 | goto out_sleep; | 148 | goto out_sleep; |
| 151 | } | 149 | } |
| 152 | if (xprt->nocong || __xprt_get_cong(xprt, task)) { | 150 | if (xprt->nocong || __xprt_get_cong(xprt, task)) { |