From e4922355a1fd47077470295fe71c223243e6e936 Mon Sep 17 00:00:00 2001
From: "J. R. Okajima" <hooanon05@yahoo.co.jp>
Date: Wed, 11 Aug 2010 13:10:16 -0400
Subject: [PATCH] --- yaml --- r: 209659 b: refs/heads/master c:
 0702099bd86c33c2dcdbd3963433a61f3f503901 h: refs/heads/master i:   209657:
 c18ec7ea0079b0fe30e2ad0bcd16dcc1bac0bd71   209655:
 d65054c8448da2dd2ba3f2de4ddbfba71bd6d0e6 v: v3

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

diff --git a/[refs] b/[refs]
index 9b758383a228..190434752faf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15cdc644b268a9a9ce73ce0b153129222c254b7b
+refs/heads/master: 0702099bd86c33c2dcdbd3963433a61f3f503901
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 2d141a74ae82..eb51bd6201da 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -323,7 +323,7 @@ nfs_file_fsync(struct file *file, int datasync)
 	have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
 	if (have_error)
 		ret = xchg(&ctx->error, 0);
-	if (!ret)
+	if (!ret && status < 0)
 		ret = status;
 	return ret;
 }