]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
shmem: convert shmem_init_inodecache() to void
authorweiping zhang <zhangweiping@didichuxing.com>
Thu, 16 Nov 2017 01:38:18 +0000 (17:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Nov 2017 02:21:07 +0000 (18:21 -0800)
shmem_inode_cachep was created with SLAB_PANIC flag and
shmem_init_inodecache() never returns non-zero, so convert this
function to return void.

Link: http://lkml.kernel.org/r/20170909124542.GA35224@bogon.didichuxing.com
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/shmem.c

index 7ea8b276ba8b77649aae8082b27156585b70a543..d6947d21f66c5c5dd6d136b64216d810e0ce75bd 100644 (file)
@@ -3862,12 +3862,11 @@ static void shmem_init_inode(void *foo)
        inode_init_once(&info->vfs_inode);
 }
 
-static int shmem_init_inodecache(void)
+static void shmem_init_inodecache(void)
 {
        shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
                                sizeof(struct shmem_inode_info),
                                0, SLAB_PANIC|SLAB_ACCOUNT, shmem_init_inode);
-       return 0;
 }
 
 static void shmem_destroy_inodecache(void)
@@ -3991,9 +3990,7 @@ int __init shmem_init(void)
        if (shmem_inode_cachep)
                return 0;
 
-       error = shmem_init_inodecache();
-       if (error)
-               goto out3;
+       shmem_init_inodecache();
 
        error = register_filesystem(&shmem_fs_type);
        if (error) {
@@ -4020,7 +4017,6 @@ out1:
        unregister_filesystem(&shmem_fs_type);
 out2:
        shmem_destroy_inodecache();
-out3:
        shm_mnt = ERR_PTR(error);
        return error;
 }