From 4a921ec696569ff0de0df85a820261c74d9328d7 Mon Sep 17 00:00:00 2001
From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Mon, 13 Jul 2009 11:38:23 +0800
Subject: [PATCH] --- yaml --- r: 156703 b: refs/heads/master c:
 cbfa9639aea5007313b75ec43b689d5f9e0c037d h: refs/heads/master i:   156701:
 1d78f4fbe99bb5fe8a48741089c5ee95cbdf6ec4   156699:
 047b938e206ff311d629de23b294bf3b424a6713   156695:
 c63e43042be478b86d2551c40e54d36dacebf157   156687:
 8a46c8aa33e062addbdd9a242026442fcb10d95d   156671:
 4be62f6d72e4f397d3c25450b2f89580e868a005 v: v3

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

diff --git a/[refs] b/[refs]
index d177ad3ed2a8..1160800dfa28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44d8e4e1e9b941065eb7578669fe51eb65c73e63
+refs/heads/master: cbfa9639aea5007313b75ec43b689d5f9e0c037d
diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c
index b2c52b3a1484..25aced3b0c7d 100644
--- a/trunk/fs/ocfs2/aops.c
+++ b/trunk/fs/ocfs2/aops.c
@@ -1301,7 +1301,7 @@ static int ocfs2_write_cluster(struct address_space *mapping,
 		if (tmpret) {
 			mlog_errno(tmpret);
 			if (ret == 0)
-				tmpret = ret;
+				ret = tmpret;
 		}
 	}