Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "sysfs: Kill nlink counting."

Browse source 
This reverts commit 524b6c5b39.

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>
This commit is contained in:
Greg Kroah-Hartman 2012-03-08 13:03:10 -08:00
parent 7b60a18da3
commit 54d20f006c
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/sysfs/dir.c
View file

@ -91,6 +91,9 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
struct rb_node **node = &sd->s_parent->s_dir.children.rb_node; struct rb_node **node = &sd->s_parent->s_dir.children.rb_node;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
if (sysfs_type(sd) == SYSFS_DIR)
sd->s_parent->s_dir.subdirs++;
while (*node) { while (*node) {
struct sysfs_dirent *pos; struct sysfs_dirent *pos;
int result; int result;
@ -123,6 +126,9 @@ static int sysfs_link_sibling(struct sysfs_dirent *sd)
*/ */
static void sysfs_unlink_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); rb_erase(&sd->s_rb, &sd->s_parent->s_dir.children);
} }

3
fs/sysfs/inode.c
View file

@ -217,6 +217,9 @@ static void sysfs_refresh_inode(struct sysfs_dirent *sd, struct inode *inode)
iattrs->ia_secdata, iattrs->ia_secdata,
iattrs->ia_secdata_len); 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) int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)

1
fs/sysfs/sysfs.h
View file

@ -19,6 +19,7 @@ struct sysfs_open_dirent;
struct sysfs_elem_dir { struct sysfs_elem_dir {
struct kobject *kobj; struct kobject *kobj;
unsigned long subdirs;
/* children rbtree starts here and goes through sd->s_rb */ /* children rbtree starts here and goes through sd->s_rb */
struct rb_root children; struct rb_root children;
}; };