From: Eric W. Biederman <ebiederm@xmission.com>
Date: Tue, 31 Jan 2012 04:09:33 +0000 (-0800)
Subject: sysctl: An easier to read version of find_subdir
X-Git-Tag: v3.4-rc1~99^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51f72f4a0f92e4abde33a8bca0fac9667575d035;p=thirdparty%2Fkernel%2Flinux.git

sysctl: An easier to read version of find_subdir

Suggested-by:  Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 27e265ba1afed..ebe8b3076db7d 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -833,9 +833,9 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
 	entry = find_entry(&head, dir, name, namelen);
 	if (!entry)
 		return ERR_PTR(-ENOENT);
-	if (S_ISDIR(entry->mode))
-		return container_of(head, struct ctl_dir, header);
-	return ERR_PTR(-ENOTDIR);
+	if (!S_ISDIR(entry->mode))
+		return ERR_PTR(-ENOTDIR);
+	return container_of(head, struct ctl_dir, header);
 }
 
 static struct ctl_dir *new_dir(struct ctl_table_set *set,