diff --git a/[refs] b/[refs] index f62b63305704..4762d18286fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67eeb5685d2a211c0252ac7884142e503c759500 +refs/heads/master: 9b1d0998d24f9c207d5fbdd0b8bac07284e0eda7 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index c717a74f2178..f55df7192b95 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -2157,17 +2157,16 @@ static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd, break; for (i = 0; i < nr_pages; i++) { struct page *page = pvec.pages[i]; - index = page->index; - if (index > end) + if (page->index > end) break; - index++; - BUG_ON(!PageLocked(page)); BUG_ON(PageWriteback(page)); block_invalidatepage(page, 0); ClearPageUptodate(page); unlock_page(page); } + index = pvec.pages[nr_pages - 1]->index + 1; + pagevec_release(&pvec); } return; }