diff options
author | Jan Kara <jack@suse.cz> | 2010-03-03 16:19:32 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-03-03 16:19:32 -0500 |
commit | 9b1d0998d24f9c207d5fbdd0b8bac07284e0eda7 (patch) | |
tree | 0670c100d74086884c772e72d3e4135b57118515 /fs/ext4/inode.c | |
parent | 67eeb5685d2a211c0252ac7884142e503c759500 (diff) |
ext4: Release page references acquired in ext4_da_block_invalidatepages
We forget to release page references we acquire in
ext4_da_block_invalidatepages. Luckily, this function gets called only if we
are not able to allocate blocks for delay-allocated data so that function
should better never be called.
Also cleanup handling of index variable.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c717a74f2178..f55df7192b95 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2157,17 +2157,16 @@ static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd, | |||
2157 | break; | 2157 | break; |
2158 | for (i = 0; i < nr_pages; i++) { | 2158 | for (i = 0; i < nr_pages; i++) { |
2159 | struct page *page = pvec.pages[i]; | 2159 | struct page *page = pvec.pages[i]; |
2160 | index = page->index; | 2160 | if (page->index > end) |
2161 | if (index > end) | ||
2162 | break; | 2161 | break; |
2163 | index++; | ||
2164 | |||
2165 | BUG_ON(!PageLocked(page)); | 2162 | BUG_ON(!PageLocked(page)); |
2166 | BUG_ON(PageWriteback(page)); | 2163 | BUG_ON(PageWriteback(page)); |
2167 | block_invalidatepage(page, 0); | 2164 | block_invalidatepage(page, 0); |
2168 | ClearPageUptodate(page); | 2165 | ClearPageUptodate(page); |
2169 | unlock_page(page); | 2166 | unlock_page(page); |
2170 | } | 2167 | } |
2168 | index = pvec.pages[nr_pages - 1]->index + 1; | ||
2169 | pagevec_release(&pvec); | ||
2171 | } | 2170 | } |
2172 | return; | 2171 | return; |
2173 | } | 2172 | } |