From f368aa407aad91a2309f894cb5b96fcc9be13a7b Mon Sep 17 00:00:00 2001
From: Curt Wohlgemuth <curtw@google.com>
Date: Sat, 26 Feb 2011 12:27:52 -0500
Subject: [PATCH] --- yaml --- r: 242367 b: refs/heads/master c:
 c7f5938adce6727b9d17785f289c1146bd88d678 h: refs/heads/master i:   242365:
 b2a190395b8d91b42a647052c1e8875ff2f3624b   242363:
 17ab5d0c4961caf8b8b9e0da7fbd8f972aa67f96   242359:
 8079f133cb340a7e4af25edb6b19730997c6ea5b   242351:
 8c06d9c262dd96ac1adbbf31d1429b6e66976f44   242335:
 8830b6dd03605203d70b2e59373f41975ce97895   242303:
 5d7b8e2c2dded5bf668ba559f0c2314c711d2f6c v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/inode.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 42ba26128d6b..d417fc7a539d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0fd9b90765f604374c42de8ac59d6584afce264
+refs/heads/master: c7f5938adce6727b9d17785f289c1146bd88d678
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index fd369dbce6af..e878c3a7aaf0 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2165,8 +2165,7 @@ static int mpage_da_submit_io(struct mpage_da_data *mpd,
 	return ret;
 }
 
-static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd,
-					sector_t logical, long blk_cnt)
+static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd)
 {
 	int nr_pages, i;
 	pgoff_t index, end;
@@ -2174,9 +2173,8 @@ static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd,
 	struct inode *inode = mpd->inode;
 	struct address_space *mapping = inode->i_mapping;
 
-	index = logical >> (PAGE_CACHE_SHIFT - inode->i_blkbits);
-	end   = (logical + blk_cnt - 1) >>
-				(PAGE_CACHE_SHIFT - inode->i_blkbits);
+	index = mpd->first_page;
+	end   = mpd->next_page - 1;
 	while (index <= end) {
 		nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
 		if (nr_pages == 0)
@@ -2312,8 +2310,7 @@ static void mpage_da_map_and_submit(struct mpage_da_data *mpd)
 				ext4_print_free_blocks(mpd->inode);
 		}
 		/* invalidate all the pages */
-		ext4_da_block_invalidatepages(mpd, next,
-				mpd->b_size >> mpd->inode->i_blkbits);
+		ext4_da_block_invalidatepages(mpd);
 
 		/* Mark this page range as having been completed */
 		mpd->io_done = 1;