Commit 10bbd235 authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

pagevec: Use xa_mark_t 



Removes sparse warnings.

Signed-off-by: default avatarMatthew Wilcox <willy@infradead.org>
parent 67891fff

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -3778,7 +3778,7 @@ int btree_write_cache_pages(struct address_space *mapping, 
	pgoff_t index;

	pgoff_t end;		/* Inclusive */

	int scanned = 0;

	int tag;

	xa_mark_t tag;



	pagevec_init(&pvec);

	if (wbc->range_cyclic) {
@@ -3903,7 +3903,7 @@ static int extent_write_cache_pages(struct address_space *mapping, 
	pgoff_t done_index;

	int range_whole = 0;

	int scanned = 0;

	int tag;

	xa_mark_t tag;



	/*

	 * We have to hold onto the inode so that ordered extents can do their

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2613,7 +2613,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) 
	long left = mpd->wbc->nr_to_write;

	pgoff_t index = mpd->first_page;

	pgoff_t end = mpd->last_page;

	int tag;

	xa_mark_t tag;

	int i, err = 0;

	int blkbits = mpd->inode->i_blkbits;

	ext4_lblk_t lblk;

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -2003,7 +2003,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
	pgoff_t last_idx = ULONG_MAX;

	int cycled;

	int range_whole = 0;

	int tag;

	xa_mark_t tag;



	pagevec_init(&pvec);

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, 
	pgoff_t done_index;

	int cycled;

	int range_whole = 0;

	int tag;

	xa_mark_t tag;



	pagevec_init(&pvec);

	if (wbc->range_cyclic) {

include/linux/pagevec.h

+5 −3
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef _LINUX_PAGEVEC_H

#define _LINUX_PAGEVEC_H



#include <linux/xarray.h>



/* 15 pointers + header align the pagevec structure to a power of two */

#define PAGEVEC_SIZE	15
@@ -40,12 +42,12 @@ 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);

		xa_mark_t 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);

		xa_mark_t tag, unsigned max_pages);

static inline unsigned pagevec_lookup_tag(struct pagevec *pvec,

		struct address_space *mapping, pgoff_t *index, int tag)

		struct address_space *mapping, pgoff_t *index, xa_mark_t tag)

{

	return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag);

}