summaryrefslogtreecommitdiffstats
path: root/fs/sysfs/sysfs.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 13:03:10 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 13:03:10 -0800
commit54d20f006ceff1f2f1e69d0e54049b6c0765c039 (patch)
treee2418ba2f9ee4830d4fc3e16599189b8e1256899 /fs/sysfs/sysfs.h
parent7b60a18da393ed70db043a777fd9e6d5363077c4 (diff)
downloadtalos-op-linux-54d20f006ceff1f2f1e69d0e54049b6c0765c039.tar.gz
talos-op-linux-54d20f006ceff1f2f1e69d0e54049b6c0765c039.zip
Revert "sysfs: Kill nlink counting."
This reverts commit 524b6c5b39b931311dfe5a2f5abae2f5c9731676. It has shown to break userspace tools, which is not acceptable. Reported-by: Jiri Slaby <jslaby@suse.cz> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/sysfs/sysfs.h')
-rw-r--r--fs/sysfs/sysfs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 6289a00287db..661a9639570b 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -19,6 +19,7 @@ struct sysfs_open_dirent;
struct sysfs_elem_dir {
struct kobject *kobj;
+ unsigned long subdirs;
/* children rbtree starts here and goes through sd->s_rb */
struct rb_root children;
};
OpenPOWER on IntegriCloud