lkml.org 
[lkml]   [2018]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v8 07/17] fs: Refactoring in alloc_super()
    From
    Date
    Do two list_lru_init_memcg() calls after prealloc_super().
    destroy_unused_super() in fail path is OK with this.
    Next patch needs such the order.

    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
    Tested-by: Shakeel Butt <shakeelb@google.com>
    ---
    fs/super.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/super.c b/fs/super.c
    index 43400f5fa33a..002e46d874da 100644
    --- a/fs/super.c
    +++ b/fs/super.c
    @@ -243,10 +243,6 @@ static struct super_block *alloc_super(struct fs_context *fc)
    INIT_LIST_HEAD(&s->s_inodes_wb);
    spin_lock_init(&s->s_inode_wblist_lock);

    - if (list_lru_init_memcg(&s->s_dentry_lru))
    - goto fail;
    - if (list_lru_init_memcg(&s->s_inode_lru))
    - goto fail;
    s->s_count = 1;
    atomic_set(&s->s_active, 1);
    mutex_init(&s->s_vfs_rename_mutex);
    @@ -264,6 +260,10 @@ static struct super_block *alloc_super(struct fs_context *fc)
    s->s_shrink.flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE;
    if (prealloc_shrinker(&s->s_shrink))
    goto fail;
    + if (list_lru_init_memcg(&s->s_dentry_lru))
    + goto fail;
    + if (list_lru_init_memcg(&s->s_inode_lru))
    + goto fail;
    return s;

    fail:
    \
     
     \ /
      Last update: 2018-07-03 17:14    [W:4.079 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site