sysfs: Kill nlink counting.

Tracking the number of subdirectories requires an extra field that increases
the size of sysfs_dirent.  nlinks are not particularly interesting for sysfs
and the nlink counts are wrong when network namespaces are involved so stop
counting them, and always return nlink == 1.  Userspace already knows that
directories with nlink == 1 have an nlink count they can't use to count
subdirectories.

This reduces the size of sysfs_dirent by 8 bytes on 64bit platforms.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 0589c9a694bf635b4d349694e7dc0c0dc0d2ef00..ea64d01400acf5e39b42bc96d37e9288920623f5 100644 (file)
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -91,9 +91,6 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
        struct rb_node **node = &sd->s_parent->s_dir.children.rb_node;
        struct rb_node *parent = NULL;
 
-       if (sysfs_type(sd) == SYSFS_DIR)
-               sd->s_parent->s_dir.subdirs++;
-
        while (*node) {
                struct sysfs_dirent *pos;
                int result;
@@ -126,9 +123,6 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
  */
 static void sysfs_unlink_sibling(struct sysfs_dirent *sd)
 {
-       if (sysfs_type(sd) == SYSFS_DIR)
-               sd->s_parent->s_dir.subdirs--;
-
        rb_erase(&sd->s_rb, &sd->s_parent->s_dir.children);
 }
 

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 4a802b4a90566aaf45e4e0c710faf870085caf6a..0ac3e1c1a7d83651c5aedaa4bf4cfdb89e2afb9b 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -216,9 +216,6 @@ static void sysfs_refresh_inode(struct sysfs_dirent *sd, struct inode *inode)
                                            iattrs->ia_secdata,
                                            iattrs->ia_secdata_len);
        }
-
-       if (sysfs_type(sd) == SYSFS_DIR)
-               set_nlink(inode, sd->s_dir.subdirs + 2);
 }
 
 int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 661a9639570b973dcce69ac3abc4bdbe84cb6991..6289a00287dbc506dc807827411fa93e25f8474e 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -19,7 +19,6 @@ 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;
 };