From 0f586e18a9e10c76a2bf9a74cd4b62a52f5612c6 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 5 Jun 2008 16:02:35 -0400
Subject: [PATCH] --- yaml --- r: 98405 b: refs/heads/master c:
 03fa9e84e5dc10aeacb0e4eb2f708cd9fc36a5b8 h: refs/heads/master i:   98403:
 0fd6f482a809e2fcb52c6ecdbfd2a4bd2f7f12c4 v: v3

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

diff --git a/[refs] b/[refs]
index eccd3c064388..c5b71fd9b4f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e2445737ff69cef892b6fd9cd71cae2c9e9515
+refs/heads/master: 03fa9e84e5dc10aeacb0e4eb2f708cd9fc36a5b8
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index 6d8ace3e3259..f333848fd3be 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -739,12 +739,13 @@ int nfs_updatepage(struct file *file, struct page *page,
 	}
 
 	status = nfs_writepage_setup(ctx, page, offset, count);
-	__set_page_dirty_nobuffers(page);
+	if (status < 0)
+		nfs_set_pageerror(page);
+	else
+		__set_page_dirty_nobuffers(page);
 
         dprintk("NFS:      nfs_updatepage returns %d (isize %Ld)\n",
 			status, (long long)i_size_read(inode));
-	if (status < 0)
-		nfs_set_pageerror(page);
 	return status;
 }