lkml.org 
[lkml]   [2018]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 40/99] pagevec: Use xa_tag_t
    Date
    From: Matthew Wilcox <mawilcox@microsoft.com>

    Removes sparse warnings.

    Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
    ---
    fs/btrfs/extent_io.c | 4 ++--
    fs/ext4/inode.c | 2 +-
    fs/f2fs/data.c | 2 +-
    fs/gfs2/aops.c | 2 +-
    include/linux/pagevec.h | 8 +++++---
    mm/swap.c | 4 ++--
    6 files changed, 12 insertions(+), 10 deletions(-)

    diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
    index 22948f4febe7..4301cbf4e31f 100644
    --- a/fs/btrfs/extent_io.c
    +++ b/fs/btrfs/extent_io.c
    @@ -3795,7 +3795,7 @@ int btree_write_cache_pages(struct address_space *mapping,
    pgoff_t index;
    pgoff_t end; /* Inclusive */
    int scanned = 0;
    - int tag;
    + xa_tag_t tag;

    pagevec_init(&pvec);
    if (wbc->range_cyclic) {
    @@ -3922,7 +3922,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_tag_t tag;

    /*
    * We have to hold onto the inode so that ordered extents can do their
    diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
    index 534a9130f625..4b7c10853928 100644
    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -2614,7 +2614,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_tag_t tag;
    int i, err = 0;
    int blkbits = mpd->inode->i_blkbits;
    ext4_lblk_t lblk;
    diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
    index 8f51ac47b77f..c8f6d9806896 100644
    --- a/fs/f2fs/data.c
    +++ b/fs/f2fs/data.c
    @@ -1640,7 +1640,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_tag_t tag;

    pagevec_init(&pvec);

    diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
    index 1daf15a1f00c..c78ecd008191 100644
    --- a/fs/gfs2/aops.c
    +++ b/fs/gfs2/aops.c
    @@ -369,7 +369,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping,
    pgoff_t done_index;
    int cycled;
    int range_whole = 0;
    - int tag;
    + xa_tag_t tag;

    pagevec_init(&pvec);
    if (wbc->range_cyclic) {
    diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
    index 5fb6580f7f23..5168901bf06d 100644
    --- a/include/linux/pagevec.h
    +++ b/include/linux/pagevec.h
    @@ -9,6 +9,8 @@
    #ifndef _LINUX_PAGEVEC_H
    #define _LINUX_PAGEVEC_H

    +#include <linux/xarray.h>
    +
    /* 14 pointers + two long's align the pagevec structure to a power of two */
    #define PAGEVEC_SIZE 14

    @@ -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_tag_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_tag_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_tag_t tag)
    {
    return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag);
    }
    diff --git a/mm/swap.c b/mm/swap.c
    index 8d7773cb2c3f..31d79479dacf 100644
    --- a/mm/swap.c
    +++ b/mm/swap.c
    @@ -991,7 +991,7 @@ 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)
    + xa_tag_t tag)
    {
    pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
    PAGEVEC_SIZE, pvec->pages);
    @@ -1001,7 +1001,7 @@ EXPORT_SYMBOL(pagevec_lookup_range_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_tag_t tag, unsigned max_pages)
    {
    pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
    min_t(unsigned int, max_pages, PAGEVEC_SIZE), pvec->pages);
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-01-18 00:21    [W:4.480 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site