From 6a461c92c7f2c78b50a5e77c3398539b823f4ae6 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Tue, 29 Apr 2008 22:01:27 -0400
Subject: [PATCH] --- yaml --- r: 95063 b: refs/heads/master c:
 7c2f3d6f89aab04c5c66a0a757888d3a77a5e899 h: refs/heads/master i:   95061:
 369f8286e6d7b2773a62063c37d745f662d44d36   95059:
 f5dc9442b4ce8fde1f7c9e257ec353436ca0dda7   95055:
 391932d35b74831e010a89fc6b8146c07981aecb v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext3/inode.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e9cd3a4ea671..7cf09d97bb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6e39a7ade8a5329c5651a2bc07010b3011da6a
+refs/heads/master: 7c2f3d6f89aab04c5c66a0a757888d3a77a5e899
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index cc47b76091bf..6ae4ecf3ce40 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -1261,10 +1261,11 @@ static int ext3_ordered_write_end(struct file *file,
 		new_i_size = pos + copied;
 		if (new_i_size > EXT3_I(inode)->i_disksize)
 			EXT3_I(inode)->i_disksize = new_i_size;
-		copied = ext3_generic_write_end(file, mapping, pos, len, copied,
+		ret2 = ext3_generic_write_end(file, mapping, pos, len, copied,
 							page, fsdata);
-		if (copied < 0)
-			ret = copied;
+		copied = ret2;
+		if (ret2 < 0)
+			ret = ret2;
 	}
 	ret2 = ext3_journal_stop(handle);
 	if (!ret)
@@ -1289,10 +1290,11 @@ static int ext3_writeback_write_end(struct file *file,
 	if (new_i_size > EXT3_I(inode)->i_disksize)
 		EXT3_I(inode)->i_disksize = new_i_size;
 
-	copied = ext3_generic_write_end(file, mapping, pos, len, copied,
+	ret2 = ext3_generic_write_end(file, mapping, pos, len, copied,
 							page, fsdata);
-	if (copied < 0)
-		ret = copied;
+	copied = ret2;
+	if (ret2 < 0)
+		ret = ret2;
 
 	ret2 = ext3_journal_stop(handle);
 	if (!ret)