commit 3320c60b3a26d05666285c55ab08ee043c017ba3
author Al Viro <viro@zeniv.linux.org.uk> Mon Mar 10 02:30:55 2014 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue May 06 17:32:50 2014 -0400
tree c845310a12f63dd709d7170f4f2e7806d41f3003
parent 71d8e532b1549a478e6a6a8a44f309d050294d00

dio: take updating ->result into do_direct_IO()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index adfa1fb..387d919 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1003,6 +1003,7 @@
 						1 << blkbits);
 				sdio->block_in_file++;
 				block_in_page++;
+				dio->result += 1 << blkbits;
 				goto next_block;
 			}
 
@@ -1044,6 +1045,7 @@
 			sdio->block_in_file += this_chunk_blocks;
 			block_in_page += this_chunk_blocks;
 			sdio->blocks_available -= this_chunk_blocks;
+			dio->result += this_chunk_blocks << blkbits;
 next_block:
 			BUG_ON(sdio->block_in_file > sdio->final_block_in_request);
 			if (sdio->block_in_file == sdio->final_block_in_request)
@@ -1271,10 +1273,6 @@
 
 		retval = do_direct_IO(dio, &sdio, &map_bh);
 
-		dio->result += iter->iov[seg].iov_len -
-			((sdio.final_block_in_request - sdio.block_in_file) <<
-					blkbits);
-
 		if (retval) {
 			dio_cleanup(dio, &sdio);
 			break;