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

Commit 23396180 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

sysfs: Remove support for tagged directories with untagged members. 



Now that /sys/class/net/bonding_masters is implemented as a tagged sysfs
file we can remove support for untagged files in tagged directories.

This change removes any ambiguity of what a NULL namespace value
means.  A NULL namespace parameter after this patch means
that we are talking about an untagged sysfs dirent.

This makes the sysfs code much less prone to mistakes when during
maintenance.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c22400a

fs/sysfs/dir.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -543,7 +543,7 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, 
	struct sysfs_dirent *sd;

	struct sysfs_dirent *sd;





	for (sd = parent_sd->s_dir.children; sd; sd = sd->s_sibling) {

	for (sd = parent_sd->s_dir.children; sd; sd = sd->s_sibling) {

		if (ns && sd->s_ns && (sd->s_ns != ns))

		if (sd->s_ns != ns)

			continue;

			continue;

		if (!strcmp(sd->s_name, name))

		if (!strcmp(sd->s_name, name))

			return sd;

			return sd;
@@ -885,7 +885,7 @@ static struct sysfs_dirent *sysfs_dir_pos(const void *ns, 
		while (pos && (ino > pos->s_ino))

		while (pos && (ino > pos->s_ino))

			pos = pos->s_sibling;

			pos = pos->s_sibling;

	}

	}

	while (pos && pos->s_ns && pos->s_ns != ns)

	while (pos && pos->s_ns != ns)

		pos = pos->s_sibling;

		pos = pos->s_sibling;

	return pos;

	return pos;

}

}
@@ -896,7 +896,7 @@ static struct sysfs_dirent *sysfs_dir_next_pos(const void *ns, 
	pos = sysfs_dir_pos(ns, parent_sd, ino, pos);

	pos = sysfs_dir_pos(ns, parent_sd, ino, pos);

	if (pos)

	if (pos)

		pos = pos->s_sibling;

		pos = pos->s_sibling;

	while (pos && pos->s_ns && pos->s_ns != ns)

	while (pos && pos->s_ns != ns)

		pos = pos->s_sibling;

		pos = pos->s_sibling;

	return pos;

	return pos;

}

}

fs/sysfs/inode.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -336,8 +336,6 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha 
	sysfs_addrm_start(&acxt, dir_sd);

	sysfs_addrm_start(&acxt, dir_sd);





	sd = sysfs_find_dirent(dir_sd, ns, name);

	sd = sysfs_find_dirent(dir_sd, ns, name);

	if (sd && (sd->s_ns != ns))

		sd = NULL;

	if (sd)

	if (sd)

		sysfs_remove_one(&acxt, sd);

		sysfs_remove_one(&acxt, sd);