lkml.org 
[lkml]   [2018]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 70/74] page cache: Finish XArray conversion
    Date
    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 <willy@infradead.org>
    ---
    fs/inode.c | 2 +-
    mm/swap_state.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/inode.c b/fs/inode.c
    index 077a6174dfd5..8ab03bf193a4 100644
    --- a/fs/inode.c
    +++ b/fs/inode.c
    @@ -349,7 +349,7 @@ EXPORT_SYMBOL(inc_nlink);

    static void __address_space_init_once(struct address_space *mapping)
    {
    - INIT_RADIX_TREE(&mapping->i_pages, GFP_ATOMIC | __GFP_ACCOUNT);
    + xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ);
    init_rwsem(&mapping->i_mmap_rwsem);
    INIT_LIST_HEAD(&mapping->private_list);
    spin_lock_init(&mapping->private_lock);
    diff --git a/mm/swap_state.c b/mm/swap_state.c
    index 5cd42d05177e..3d813d2b5dff 100644
    --- a/mm/swap_state.c
    +++ b/mm/swap_state.c
    @@ -596,7 +596,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->i_pages, GFP_ATOMIC|__GFP_NOWARN);
    + xa_init_flags(&space->i_pages, XA_FLAGS_LOCK_IRQ);
    atomic_set(&space->i_mmap_writable, 0);
    space->a_ops = &swap_aops;
    /* swap cache doesn't use writeback related tags */
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-06-17 04:04    [W:4.265 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site