Skip to contentSkip to conversation

ext4: fix a BUG in ext4_mpage_readpages()

RFC In review yalin wang 2 participants 2 messages Nov 4, 2015 – Nov 5, 2015 ext4 file system

lore
Share & tools
lore

yalin wang

author
#0 lore raw

RFC 1/1 ext4: fix a BUG in ext4_mpage_readpages()

The last block should be the total read pages last block, need adjust the block number when caculate every page.

---
 fs/ext4/readpage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/readpage.c +1 -1
index 5dc5e95..d20c39d 100644
@@ -174,7 +174,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
 			goto confused;
 
 		block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
-		last_block = block_in_file + nr_pages * blocks_per_page;
+		last_block = block_in_file + (nr_pages - page_idx) * blocks_per_page;
 		last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
 		if (last_block > last_block_in_file)
 			last_block = last_block_in_file;
Signature · 1 line
1.9.1
reviewer
#1 lore raw
Quoted 13 lines · yalin wang

The last block should be the total read pages last block, need adjust the block number when caculate every page.

---
 fs/ext4/readpage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/readpage.c +0 -0
index 5dc5e95..d20c39d 100644

fs/ext4/readpage.c int ext4_mpage_readpages(struct address_space *mapping, · line 177

Quoted 5 lines
fs/ext4/readpage.c +1 -1
@@ -174,7 +174,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
 			goto confused;
 
 		block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
-		last_block = block_in_file + nr_pages * blocks_per_page;
+		last_block = block_in_file + (nr_pages - page_idx) * blocks_per_page;

I don't think your patch is correct. The for loop decrements nr_pages at each iteration so the original code looks fine... Or which problems do you observe?

Honza

Quoted 10 lines
fs/ext4/readpage.c +0 -0
 		last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
 		if (last_block > last_block_in_file)
 			last_block = last_block_in_file;
Signature · 6 lines
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR