diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-10-19 23:28:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 10:26:38 -0700 |
| commit | eda3cef8dd2b83875affe82595db9d0c278879b2 (patch) | |
| tree | 8243651c72751fc2204c8423f8a372c0dddba8a4 /fs/nfs | |
| parent | b6dff26a08189932eeb0fa4261e09e733b0fc540 (diff) | |
[PATCH] NFS: Fix error handling in nfs_direct_write_result()
If the RPC call tanked, we should not be checking the return value
of data->res.verf->committed, since it is unlikely to even be
initialised.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/direct.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 9f7f8b9ea1e..1e873fcab94 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -532,10 +532,12 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata) spin_lock(&dreq->lock); - if (likely(status >= 0)) - dreq->count += data->res.count; - else - dreq->error = task->tk_status; + if (unlikely(status < 0)) { + dreq->error = status; + goto out_unlock; + } + + dreq->count += data->res.count; if (data->res.verf->committed != NFS_FILE_SYNC) { switch (dreq->flags) { @@ -550,7 +552,7 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata) } } } - +out_unlock: spin_unlock(&dreq->lock); } |