From 1d78f4fbe99bb5fe8a48741089c5ee95cbdf6ec4 Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@gmail.com>
Date: Sat, 11 Jul 2009 10:57:27 -0500
Subject: [PATCH] --- yaml --- r: 156701 b: refs/heads/master c:
 cefcb800fa9536bb6f29485c53e6c82a65b0c022 h: refs/heads/master i:   156699:
 047b938e206ff311d629de23b294bf3b424a6713 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/file.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 285c54fc7ce3..c5fbbf05a989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 812e7a6a43fc34bc8f70c2b80db4ea5997d66ea8
+refs/heads/master: cefcb800fa9536bb6f29485c53e6c82a65b0c022
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index a49fa44aea1f..aa501d3f93f1 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -1851,6 +1851,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
 		if (ret)
 			goto out_dio;
 
+		count = ocount;
 		ret = generic_write_checks(file, ppos, &count,
 					   S_ISBLK(inode->i_mode));
 		if (ret)