The patch titled
NFS: Fix error handling in nfs_direct_write_result()
has been removed from the -mm tree. Its filename was
nfs-fix-error-handling-in-nfs_direct_write_result.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: NFS: Fix error handling in nfs_direct_write_result()
From: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/direct.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff -puN fs/nfs/direct.c~nfs-fix-error-handling-in-nfs_direct_write_result fs/nfs/direct.c
--- a/fs/nfs/direct.c~nfs-fix-error-handling-in-nfs_direct_write_result
+++ a/fs/nfs/direct.c
@@ -532,10 +532,12 @@ static void nfs_direct_write_result(stru
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(stru
}
}
}
-
+out_unlock:
spin_unlock(&dreq->lock);
}
_
Patches currently in -mm which might be from Trond.Myklebust@xxxxxxxxxx are
origin.patch
vfs-make-d_materialise_unique-enforce-directory.patch
nfs-cache-invalidation-fixup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
