aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/sysfs/dir.c6
-rw-r--r--fs/sysfs/inode.c3
-rw-r--r--fs/sysfs/sysfs.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 0589c9a694bf..ea64d01400ac 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -91,9 +91,6 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
91 struct rb_node **node = &sd->s_parent->s_dir.children.rb_node; 91 struct rb_node **node = &sd->s_parent->s_dir.children.rb_node;
92 struct rb_node *parent = NULL; 92 struct rb_node *parent = NULL;
93 93
94 if (sysfs_type(sd) == SYSFS_DIR)
95 sd->s_parent->s_dir.subdirs++;
96
97 while (*node) { 94 while (*node) {
98 struct sysfs_dirent *pos; 95 struct sysfs_dirent *pos;
99 int result; 96 int result;
@@ -126,9 +123,6 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
126 */ 123 */
127static void sysfs_unlink_sibling(struct sysfs_dirent *sd) 124static void sysfs_unlink_sibling(struct sysfs_dirent *sd)
128{ 125{
129 if (sysfs_type(sd) == SYSFS_DIR)
130 sd->s_parent->s_dir.subdirs--;
131
132 rb_erase(&sd->s_rb, &sd->s_parent->s_dir.children); 126 rb_erase(&sd->s_rb, &sd->s_parent->s_dir.children);
133} 127}
134 128
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 4a802b4a9056..0ac3e1c1a7d8 100644
--- 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)
216 iattrs->ia_secdata, 216 iattrs->ia_secdata,
217 iattrs->ia_secdata_len); 217 iattrs->ia_secdata_len);
218 } 218 }
219
220 if (sysfs_type(sd) == SYSFS_DIR)
221 set_nlink(inode, sd->s_dir.subdirs + 2);
222} 219}
223 220
224int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) 221int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 661a9639570b..6289a00287db 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -19,7 +19,6 @@ struct sysfs_open_dirent;
19struct sysfs_elem_dir { 19struct sysfs_elem_dir {
20 struct kobject *kobj; 20 struct kobject *kobj;
21 21
22 unsigned long subdirs;
23 /* children rbtree starts here and goes through sd->s_rb */ 22 /* children rbtree starts here and goes through sd->s_rb */
24 struct rb_root children; 23 struct rb_root children;
25}; 24};