Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524b6c5b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cafa6b5d

fs/sysfs/dir.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

}

fs/sysfs/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -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)

fs/sysfs/sysfs.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};