lkml.org 
[lkml]   [2017]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 67/78] page cache: Finish XArray conversion
    Date
    From: Matthew Wilcox <mawilcox@microsoft.com>

    With no more radix tree API users left, we can drop the GFP flags
    and use xa_init() instead of INIT_RADIX_TREE().

    Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
    ---
    fs/inode.c | 2 +-
    include/linux/fs.h | 2 +-
    mm/swap_state.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/inode.c b/fs/inode.c
    index c7b00573c10d..2046ff6dd1b3 100644
    --- a/fs/inode.c
    +++ b/fs/inode.c
    @@ -348,7 +348,7 @@ EXPORT_SYMBOL(inc_nlink);
    void address_space_init_once(struct address_space *mapping)
    {
    memset(mapping, 0, sizeof(*mapping));
    - INIT_RADIX_TREE(&mapping->pages, GFP_ATOMIC | __GFP_ACCOUNT);
    + xa_init(&mapping->pages);
    init_rwsem(&mapping->i_mmap_rwsem);
    INIT_LIST_HEAD(&mapping->private_list);
    spin_lock_init(&mapping->private_lock);
    diff --git a/include/linux/fs.h b/include/linux/fs.h
    index c58bc3c619bf..b459bf4ddb62 100644
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -410,7 +410,7 @@ int pagecache_write_end(struct file *, struct address_space *mapping,
    */
    struct address_space {
    struct inode *host;
    - struct radix_tree_root pages;
    + struct xarray pages;
    gfp_t gfp_mask;
    atomic_t i_mmap_writable;
    struct rb_root_cached i_mmap;
    diff --git a/mm/swap_state.c b/mm/swap_state.c
    index 219e3b4f09e6..6ee5b17d7e79 100644
    --- a/mm/swap_state.c
    +++ b/mm/swap_state.c
    @@ -573,7 +573,7 @@ int init_swap_address_space(unsigned int type, unsigned long nr_pages)
    return -ENOMEM;
    for (i = 0; i < nr; i++) {
    space = spaces + i;
    - INIT_RADIX_TREE(&space->pages, GFP_ATOMIC|__GFP_NOWARN);
    + xa_init(&space->pages);
    atomic_set(&space->i_mmap_writable, 0);
    space->a_ops = &swap_aops;
    /* swap cache doesn't use writeback related tags */
    --
    2.15.1
    \
     
     \ /
      Last update: 2017-12-15 23:30    [W:4.038 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site