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;