fs: use pagevec_lookup_range() in page_cache_seek_hole_data()
authorJan Kara <jack@suse.cz>
Wed, 6 Sep 2017 23:21:37 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 00:27:27 +0000 (17:27 -0700)
We want only pages from given range in page_cache_seek_hole_data().  Use
pagevec_lookup_range() instead of pagevec_lookup() and remove
unnecessary code.

Note that the check for getting less pages than desired can be removed
because index gets updated by pagevec_lookup_range().

Link: http://lkml.kernel.org/r/20170726114704.7626-9-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/buffer.c

index 7e531bb356bd3ad58757f550fdec459106644d44..8770b58ca56979441c21e0fe3652fecb24ee2c83 100644 (file)
@@ -3549,11 +3549,10 @@ page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
        pagevec_init(&pvec, 0);
 
        do {
        pagevec_init(&pvec, 0);
 
        do {
-               unsigned want, nr_pages, i;
+               unsigned nr_pages, i;
 
 
-               want = min_t(unsigned, end - index, PAGEVEC_SIZE);
-               nr_pages = pagevec_lookup(&pvec, inode->i_mapping, &index,
-                                         want);
+               nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, &index,
+                                               end - 1, PAGEVEC_SIZE);
                if (nr_pages == 0)
                        break;
 
                if (nr_pages == 0)
                        break;
 
@@ -3574,10 +3573,6 @@ page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
                            lastoff < page_offset(page))
                                goto check_range;
 
                            lastoff < page_offset(page))
                                goto check_range;
 
-                       /* Searching done if the page index is out of range. */
-                       if (page->index >= end)
-                               goto not_found;
-
                        lock_page(page);
                        if (likely(page->mapping == inode->i_mapping) &&
                            page_has_buffers(page)) {
                        lock_page(page);
                        if (likely(page->mapping == inode->i_mapping) &&
                            page_has_buffers(page)) {
@@ -3590,11 +3585,6 @@ page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
                        unlock_page(page);
                        lastoff = page_offset(page) + PAGE_SIZE;
                }
                        unlock_page(page);
                        lastoff = page_offset(page) + PAGE_SIZE;
                }
-
-               /* Searching done if fewer pages returned than wanted. */
-               if (nr_pages < want)
-                       break;
-
                pagevec_release(&pvec);
        } while (index < end);
 
                pagevec_release(&pvec);
        } while (index < end);