From 54e455a192dcf8deb78bc6a855170c178e466748 Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Tue, 23 Oct 2007 17:09:13 -0400
Subject: [PATCH] --- yaml --- r: 72387 b: refs/heads/master c:
 432409eebcdec38ff6fa949f097b5438d588faa5 h: refs/heads/master i:   72385:
 b31c87a3b13af682ab8da0cd4ee46c5203801a38   72383:
 f1615640295860afdebfb8605a9ad7c261ef4c12 v: v3

---
 [refs]                | 2 +-
 trunk/fs/nfs/direct.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2e90d83b996b..68c106aa2a9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7aed1c2dc4939d1d61285c738ad32700d791692
+refs/heads/master: 432409eebcdec38ff6fa949f097b5438d588faa5
diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c
index 32fe97211eea..afcab007a22b 100644
--- a/trunk/fs/nfs/direct.c
+++ b/trunk/fs/nfs/direct.c
@@ -549,13 +549,13 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata)
 
 	spin_lock(&dreq->lock);
 
-	if (unlikely(dreq->error != 0))
-		goto out_unlock;
 	if (unlikely(status < 0)) {
-		/* An error has occured, so we should not commit */
+		/* An error has occurred, so we should not commit */
 		dreq->flags = 0;
 		dreq->error = status;
 	}
+	if (unlikely(dreq->error != 0))
+		goto out_unlock;
 
 	dreq->count += data->res.count;