diff --git a/[refs] b/[refs]
index 253107e39996..285c54fc7ce3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17ae26b669886efe237b77439e43eb390fceb119
+refs/heads/master: 812e7a6a43fc34bc8f70c2b80db4ea5997d66ea8
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 62442e413a00..a49fa44aea1f 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -1918,8 +1918,10 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
 
 	mutex_unlock(&inode->i_mutex);
 
+	if (written)
+		ret = written;
 	mlog_exit(ret);
-	return written ? written : ret;
+	return ret;
 }
 
 static int ocfs2_splice_to_file(struct pipe_inode_info *pipe,