Skip to contentSkip to conversation

kernfs: remove unnecessary NULL check in __kernfs_remove()

PATCH New Tejun Heo 1 participant 1 message Jan 11, 2014 kernfs

lore
Share & tools
lore

Tejun Heo

author maintainer
#0 lore raw

PATCH 1/1 kernfs: remove unnecessary NULL check in __kernfs_remove()

895a068a524e ("kernfs: make kernfs_get_active() block if the node is deactivated but not removed") added "struct kernfs_root *root = kernfs_root(kn);" at the head of the function; however, the parameter @kn is checked for later implying that the function may be called with NULL. This means that we may end up invoking kernfs_root() with NULL which will oops. None of the existing users invokes removal with NULL @kn, so this bug doesn't actually trigger.

We can relocate kernfs_root() invocation after NULL check; however, allowing NULL param tends to cause more confusion than actually helping anything. As there's no existing user, let's remove the spurious NULL check.

This bug was detected by smatch.

---
 fs/kernfs/dir.c |    3 ---
 1 file changed, 3 deletions(-)
fs/kernfs/dir.c +0 -3
@@ -920,9 +920,6 @@ static void __kernfs_remove(struct kernf
 
 	lockdep_assert_held(&kernfs_mutex);
 
-	if (!kn)
-		return;
-
 	pr_debug("kernfs %s: removing\n", kn->name);
 
 	__kernfs_deactivate(kn);