Skip to content

Commit

Permalink
mm: remove nr_pages argument from pagevec_lookup_{,range}_tag()
Browse files Browse the repository at this point in the history 
All users of pagevec_lookup() and pagevec_lookup_range() now pass
PAGEVEC_SIZE as a desired number of pages.  Just drop the argument.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Jan Kara <[email protected]>
Reviewed-by: Daniel Jordan <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@jankara @torvalds
jankara authored and torvalds committed Nov 16, 2017
1 parent 4be9029 commit 67fd707
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 31 deletions.
6 changes: 3 additions & 3 deletions fs/btrfs/extent_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3815,7 +3815,7 @@ int btree_write_cache_pages(struct address_space *mapping,
tag_pages_for_writeback(mapping, index, end);
while (!done && !nr_to_write_done && (index <= end) &&
(nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE))) {
tag))) {
unsigned i;

scanned = 1;
Expand Down Expand Up @@ -3956,8 +3956,8 @@ static int extent_write_cache_pages(struct address_space *mapping,
tag_pages_for_writeback(mapping, index, end);
done_index = index;
while (!done && !nr_to_write_done && (index <= end) &&
(nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE))) {
(nr_pages = pagevec_lookup_range_tag(&pvec, mapping,
&index, end, tag))) {
unsigned i;

scanned = 1;
Expand Down
3 changes: 1 addition & 2 deletions fs/ceph/addr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,8 +1162,7 @@ static int ceph_writepages_start(struct address_space *mapping,
index = 0;
while ((index <= end) &&
(nr = pagevec_lookup_tag(&pvec, mapping, &index,
PAGECACHE_TAG_WRITEBACK,
PAGEVEC_SIZE))) {
PAGECACHE_TAG_WRITEBACK))) {
for (i = 0; i < nr; i++) {
page = pvec.pages[i];
if (page_snap_context(page) != snapc)
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2621,7 +2621,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
mpd->next_page = index;
while (index <= end) {
nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE);
tag);
if (nr_pages == 0)
goto out;

Expand Down
2 changes: 1 addition & 1 deletion fs/f2fs/checkpoint.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ long sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
blk_start_plug(&plug);

while ((nr_pages = pagevec_lookup_tag(&pvec, mapping, &index,
PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
PAGECACHE_TAG_DIRTY))) {
int i;

for (i = 0; i < nr_pages; i++) {
Expand Down
2 changes: 1 addition & 1 deletion fs/f2fs/data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
int i;

nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE);
tag);
if (nr_pages == 0)
break;

Expand Down
8 changes: 4 additions & 4 deletions fs/f2fs/node.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)
index = 0;

while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
PAGECACHE_TAG_DIRTY))) {
int i;

for (i = 0; i < nr_pages; i++) {
Expand Down Expand Up @@ -1440,7 +1440,7 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
index = 0;

while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
PAGECACHE_TAG_DIRTY))) {
int i;

for (i = 0; i < nr_pages; i++) {
Expand Down Expand Up @@ -1553,7 +1553,7 @@ int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc,
index = 0;

while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
PAGECACHE_TAG_DIRTY))) {
int i;

for (i = 0; i < nr_pages; i++) {
Expand Down Expand Up @@ -1651,7 +1651,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino)
pagevec_init(&pvec, 0);

while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
PAGECACHE_TAG_WRITEBACK, PAGEVEC_SIZE))) {
PAGECACHE_TAG_WRITEBACK))) {
int i;

for (i = 0; i < nr_pages; i++) {
Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/aops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping,
done_index = index;
while (!done && (index <= end)) {
nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE);
tag);
if (nr_pages == 0)
break;

Expand Down
4 changes: 2 additions & 2 deletions fs/nilfs2/btree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2158,8 +2158,8 @@ static void nilfs_btree_lookup_dirty_buffers(struct nilfs_bmap *btree,

pagevec_init(&pvec, 0);

while (pagevec_lookup_tag(&pvec, btcache, &index, PAGECACHE_TAG_DIRTY,
PAGEVEC_SIZE)) {
while (pagevec_lookup_tag(&pvec, btcache, &index,
PAGECACHE_TAG_DIRTY)) {
for (i = 0; i < pagevec_count(&pvec); i++) {
bh = head = page_buffers(pvec.pages[i]);
do {
Expand Down
7 changes: 3 additions & 4 deletions fs/nilfs2/page.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,

pagevec_init(&pvec, 0);
repeat:
if (!pagevec_lookup_tag(&pvec, smap, &index, PAGECACHE_TAG_DIRTY,
PAGEVEC_SIZE))
if (!pagevec_lookup_tag(&pvec, smap, &index, PAGECACHE_TAG_DIRTY))
return 0;

for (i = 0; i < pagevec_count(&pvec); i++) {
Expand Down Expand Up @@ -376,8 +375,8 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)

pagevec_init(&pvec, 0);

while (pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
PAGEVEC_SIZE)) {
while (pagevec_lookup_tag(&pvec, mapping, &index,
PAGECACHE_TAG_DIRTY)) {
for (i = 0; i < pagevec_count(&pvec); i++) {
struct page *page = pvec.pages[i];

Expand Down
6 changes: 3 additions & 3 deletions fs/nilfs2/segment.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
repeat:
if (unlikely(index > last) ||
!pagevec_lookup_range_tag(&pvec, mapping, &index, last,
PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))
PAGECACHE_TAG_DIRTY))
return ndirties;

for (i = 0; i < pagevec_count(&pvec); i++) {
Expand Down Expand Up @@ -755,8 +755,8 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,

pagevec_init(&pvec, 0);

while (pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
PAGEVEC_SIZE)) {
while (pagevec_lookup_tag(&pvec, mapping, &index,
PAGECACHE_TAG_DIRTY)) {
for (i = 0; i < pagevec_count(&pvec); i++) {
bh = head = page_buffers(pvec.pages[i]);
do {
Expand Down
8 changes: 3 additions & 5 deletions include/linux/pagevec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,14 @@ static inline unsigned pagevec_lookup(struct pagevec *pvec,

unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
struct address_space *mapping, pgoff_t *index, pgoff_t end,
int tag, unsigned nr_pages);
int tag);
unsigned pagevec_lookup_range_nr_tag(struct pagevec *pvec,
struct address_space *mapping, pgoff_t *index, pgoff_t end,
int tag, unsigned max_pages);
static inline unsigned pagevec_lookup_tag(struct pagevec *pvec,
struct address_space *mapping, pgoff_t *index, int tag,
unsigned nr_pages)
struct address_space *mapping, pgoff_t *index, int tag)
{
return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag,
nr_pages);
return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag);
}

static inline void pagevec_init(struct pagevec *pvec, int cold)
Expand Down
2 changes: 1 addition & 1 deletion mm/filemap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static void __filemap_fdatawait_range(struct address_space *mapping,
unsigned i;

nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,
end, PAGECACHE_TAG_WRITEBACK, PAGEVEC_SIZE);
end, PAGECACHE_TAG_WRITEBACK);
if (!nr_pages)
break;

Expand Down
2 changes: 1 addition & 1 deletion mm/page-writeback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2197,7 +2197,7 @@ int write_cache_pages(struct address_space *mapping,
int i;

nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
tag, PAGEVEC_SIZE);
tag);
if (nr_pages == 0)
break;

Expand Down
4 changes: 2 additions & 2 deletions mm/swap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,10 +988,10 @@ EXPORT_SYMBOL(pagevec_lookup_range);

unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
struct address_space *mapping, pgoff_t *index, pgoff_t end,
int tag, unsigned nr_pages)
int tag)
{
pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
nr_pages, pvec->pages);
PAGEVEC_SIZE, pvec->pages);
return pagevec_count(pvec);
}
EXPORT_SYMBOL(pagevec_lookup_range_tag);
Expand Down

0 comments on commit 67fd707

Please sign in to comment.