From: Eric W. Biederman <ebiederm@xmission.com>
Date: Sun, 8 Jan 2012 08:16:29 +0000 (-0800)
Subject: sysctl: Make the directories have nlink == 1
X-Git-Tag: v3.4-rc1~99^2~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a15e20982e2fbb06e85da584a0f150784042c17d;p=~emulex%2Finfiniband.git

sysctl: Make the directories have nlink == 1

I goofed when I made sysctl directories have nlink == 0.
nlink == 0 means the directory has been deleted.
nlink == 1 meands a directory does not count subdirectories.

Use the default nlink == 1 for sysctl directories.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 06e6f10ee8e..f6aa75111b4 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -253,7 +253,6 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
 		inode->i_fop = &proc_sys_file_operations;
 	} else {
 		inode->i_mode |= S_IFDIR;
-		clear_nlink(inode);
 		inode->i_op = &proc_sys_dir_operations;
 		inode->i_fop = &proc_sys_dir_file_operations;
 	}