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;
 		}
 	}