android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysfs: Remove support for tagged directories with untagged members.

Browse Source 
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: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2011-10-12 22:01:34 +00:00 committed by David S. Miller
parent 4c22400ab6
commit 23396180a9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/sysfs/dir.c
View File

@ -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;
} }

2
fs/sysfs/inode.c
View File

@ -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);