|
@@ -1720,13 +1720,13 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
|
|
|
|
|
|
pagevec_init(&pvec, 0);
|
|
|
while (index <= end) {
|
|
|
- nr_pages = pagevec_lookup(&pvec, mapping, &index, PAGEVEC_SIZE);
|
|
|
+ nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end,
|
|
|
+ PAGEVEC_SIZE);
|
|
|
if (nr_pages == 0)
|
|
|
break;
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
struct page *page = pvec.pages[i];
|
|
|
- if (page->index > end)
|
|
|
- break;
|
|
|
+
|
|
|
BUG_ON(!PageLocked(page));
|
|
|
BUG_ON(PageWriteback(page));
|
|
|
if (invalidate) {
|
|
@@ -2347,15 +2347,13 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
|
|
|
|
|
|
pagevec_init(&pvec, 0);
|
|
|
while (start <= end) {
|
|
|
- nr_pages = pagevec_lookup(&pvec, inode->i_mapping, &start,
|
|
|
- PAGEVEC_SIZE);
|
|
|
+ nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
|
|
|
+ &start, end, PAGEVEC_SIZE);
|
|
|
if (nr_pages == 0)
|
|
|
break;
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
struct page *page = pvec.pages[i];
|
|
|
|
|
|
- if (page->index > end)
|
|
|
- break;
|
|
|
bh = head = page_buffers(page);
|
|
|
do {
|
|
|
if (lblk < mpd->map.m_lblk)
|