From 8c8cca9b98ea975517087a853c1e850cb3345c2f Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Mon, 30 Jan 2012 20:09:33 -0800 Subject: [PATCH] --- yaml --- r: 295471 b: refs/heads/master c: 51f72f4a0f92e4abde33a8bca0fac9667575d035 h: refs/heads/master i: 295469: bcdb7095874cfedbf55c50ef427ac65d762895ba 295467: d78889bd20e99d786e3f8e98fa9120d4ce3b9358 295463: 082970498e940e3571a9b66723484f49343ba7a6 295455: 425aeb637be4789d65cb12587bfefae8753d7569 v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_sysctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fe6b780a60fe..ba4fe15a1bd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1347440db6f76ec5ae0af8d8558387f571a5e1dd +refs/heads/master: 51f72f4a0f92e4abde33a8bca0fac9667575d035 diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c index 27e265ba1afe..ebe8b3076db7 100644 --- a/trunk/fs/proc/proc_sysctl.c +++ b/trunk/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,