kernel/fail_function.c: remove meaningless null pointer check before debugfs_remove_recursive

xiongzhongjiang · torvalds · commit ea6f650465c6 · 2018-10-31T08:54:12.000-07:00
debugfs_remove_recursive() has taken the null pointer into account. just remove the null check before debugfs_remove_recursive(). Link: http://lkml.kernel.org/r/1537494404-16473-1-git-send-email-zhongjiang@huawei.com Signed-off-by: zhong jiang <zhongjiang@huawei.com> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Acked-by: Kees Cook <keescook@chromium.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/kernel/fail_function.c b/kernel/fail_function.c
@@ -173,8 +173,7 @@ static void fei_debugfs_remove_attr(struct fei_attr *attr)
 	struct dentry *dir;
 
 	dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir);
-	if (dir)
-		debugfs_remove_recursive(dir);
+	debugfs_remove_recursive(dir);
 }
 
 static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,7 @@ static void fei_debugfs_remove_attr(struct fei_attr *attr)`
`173`	`173`	`struct dentry *dir;`
`174`	`174`
`175`	`175`	`dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir);`
`176`		`- if (dir)`
`177`		`- debugfs_remove_recursive(dir);`
	`176`	`+ debugfs_remove_recursive(dir);`
`178`	`177`	`}`
`179`	`178`
`180`	`179`	`static int fei_kprobe_handler(struct kprobe kp, struct pt_regs regs)`