Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8ec03e authored by weiping zhang's avatar weiping zhang Committed by Linus Torvalds
Browse files

shmem: convert shmem_init_inodecache() to void 

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: default avatarweiping zhang <zhangweiping@didichuxing.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31367466

mm/shmem.c

+2 −6
Original line number Diff line number Diff line
@@ -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 @@ int __init shmem_init(void) 
	unregister_filesystem(&shmem_fs_type);

out2:

	shmem_destroy_inodecache();

out3:

	shm_mnt = ERR_PTR(error);

	return error;

}