Commit 6f48e238 authored by Shenghui Wang's avatar Shenghui Wang Committed by Greg Kroah-Hartman

bcache: do not check if debug dentry is ERR or NULL explicitly on remove

[ Upstream commit ae171023 ]

debugfs_remove and debugfs_remove_recursive will check if the dentry
pointer is NULL or ERR, and will do nothing in that case.

Remove the check in cache_set_free and bch_debug_init.
Signed-off-by: default avatarShenghui Wang <shhuiw@foxmail.com>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c318f884
...@@ -249,8 +249,7 @@ void bch_debug_init_cache_set(struct cache_set *c) ...@@ -249,8 +249,7 @@ void bch_debug_init_cache_set(struct cache_set *c)
void bch_debug_exit(void) void bch_debug_exit(void)
{ {
if (!IS_ERR_OR_NULL(bcache_debug)) debugfs_remove_recursive(bcache_debug);
debugfs_remove_recursive(bcache_debug);
} }
void __init bch_debug_init(struct kobject *kobj) void __init bch_debug_init(struct kobject *kobj)
......
...@@ -1491,8 +1491,7 @@ static void cache_set_free(struct closure *cl) ...@@ -1491,8 +1491,7 @@ static void cache_set_free(struct closure *cl)
struct cache *ca; struct cache *ca;
unsigned int i; unsigned int i;
if (!IS_ERR_OR_NULL(c->debug)) debugfs_remove(c->debug);
debugfs_remove(c->debug);
bch_open_buckets_free(c); bch_open_buckets_free(c);
bch_btree_cache_free(c); bch_btree_cache_free(c);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment