diff options
| author | Jan Kara <jack@suse.cz> | 2017-09-06 16:21:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 17:27:27 -0700 |
| commit | 48f2301c07b299f5bcd64563d90215a8ba73e154 (patch) | |
| tree | 1fb6b9d603c6a1598668f77980cb07d54043489a /fs/hugetlbfs | |
| parent | 2b85a6171d1370903d65cc8b84cefca26a16b5e4 (diff) | |
| download | linux-stable-48f2301c07b299f5bcd64563d90215a8ba73e154.tar.gz linux-stable-48f2301c07b299f5bcd64563d90215a8ba73e154.tar.bz2 linux-stable-48f2301c07b299f5bcd64563d90215a8ba73e154.zip | |
hugetlbfs: use pagevec_lookup_range() in remove_inode_hugepages()
We want only pages from given range in remove_inode_hugepages(). Use
pagevec_lookup_range() instead of pagevec_lookup().
Link: http://lkml.kernel.org/r/20170726114704.7626-8-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Nadia Yvette Chambers <nyc@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hugetlbfs')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index b9678ce91e25..8931236f3ef4 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -403,7 +403,6 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart, struct pagevec pvec; pgoff_t next, index; int i, freed = 0; - long lookup_nr = PAGEVEC_SIZE; bool truncate_op = (lend == LLONG_MAX); memset(&pseudo_vma, 0, sizeof(struct vm_area_struct)); @@ -412,30 +411,17 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart, next = start; while (next < end) { /* - * Don't grab more pages than the number left in the range. - */ - if (end - next < lookup_nr) - lookup_nr = end - next; - - /* * When no more pages are found, we are done. */ - if (!pagevec_lookup(&pvec, mapping, &next, lookup_nr)) + if (!pagevec_lookup_range(&pvec, mapping, &next, end - 1, + PAGEVEC_SIZE)) break; for (i = 0; i < pagevec_count(&pvec); ++i) { struct page *page = pvec.pages[i]; u32 hash; - /* - * The page (index) could be beyond end. This is - * only possible in the punch hole case as end is - * max page offset in the truncate case. - */ index = page->index; - if (index >= end) - break; - hash = hugetlb_fault_mutex_hash(h, current->mm, &pseudo_vma, mapping, index, 0); |