android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dio: take updating ->result into do_direct_IO()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-03-10 02:30:55 -04:00
parent 71d8e532b1
commit 3320c60b3a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/direct-io.c
View File

@ -1003,6 +1003,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio,
1 << blkbits); 1 << blkbits);
sdio->block_in_file++; sdio->block_in_file++;
block_in_page++; block_in_page++;
dio->result += 1 << blkbits;
goto next_block; goto next_block;
} }
@ -1044,6 +1045,7 @@ static int do_direct_IO(struct dio *dio, struct dio_submit *sdio,
sdio->block_in_file += this_chunk_blocks; sdio->block_in_file += this_chunk_blocks;
block_in_page += this_chunk_blocks; block_in_page += this_chunk_blocks;
sdio->blocks_available -= this_chunk_blocks; sdio->blocks_available -= this_chunk_blocks;
dio->result += this_chunk_blocks << blkbits;
next_block: next_block:
BUG_ON(sdio->block_in_file > sdio->final_block_in_request); BUG_ON(sdio->block_in_file > sdio->final_block_in_request);
if (sdio->block_in_file == sdio->final_block_in_request) if (sdio->block_in_file == sdio->final_block_in_request)
@ -1271,10 +1273,6 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
retval = do_direct_IO(dio, &sdio, &map_bh); 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) { if (retval) {
dio_cleanup(dio, &sdio); dio_cleanup(dio, &sdio);
break; break;