openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ubifs: fix to check error code of register_shrinker 

register_shrinker() in ubifs_init() can fail due to fail to call kzalloc.
This patch fixes to check the return value of register_shrinker, otherwise
our shrinker may be unregistered after ubifs initialized successfully.

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Chao Yu 2015-05-18 16:43:02 +08:00 committed by Richard Weinberger
parent 2bf50d42f3
commit a1fe33af5f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ubifs/super.c
View File

@ -2245,7 +2245,9 @@ static int __init ubifs_init(void)
if (!ubifs_inode_slab) if (!ubifs_inode_slab)
return -ENOMEM; return -ENOMEM;
register_shrinker(&ubifs_shrinker_info); err = register_shrinker(&ubifs_shrinker_info);
if (err)
goto out_slab;
err = ubifs_compressors_init(); err = ubifs_compressors_init();
if (err) if (err)
@ -2269,6 +2271,7 @@ static int __init ubifs_init(void)
ubifs_compressors_exit(); ubifs_compressors_exit();
out_shrinker: out_shrinker:
unregister_shrinker(&ubifs_shrinker_info); unregister_shrinker(&ubifs_shrinker_info);
out_slab:
kmem_cache_destroy(ubifs_inode_slab); kmem_cache_destroy(ubifs_inode_slab);
return err; return err;
} }