git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
fs
/
nfs
/
direct.c
diff --git
a/fs/nfs/direct.c
b/fs/nfs/direct.c
index
76ca1cb
..
125d71f
100644
(file)
--- 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);
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) {
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);
}
spin_unlock(&dreq->lock);
}