---

yaml --- r: 156700 b: refs/heads/master c: 812e7a6 h: refs/heads/master v: v3
git-mirror · Jul 10, 2009 · 363de5f · 363de5f
1 parent 047b938
commit 363de5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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,