sysfs: make sysfs_add/remove_one() call link/unlink_sibling() implictly
When adding or removing a sysfs_dirent, the user used to be required to call link/unlink separately. It was for two reasons - code looked like that before sysfs_addrm_cxt conversion and to avoid looping through parent_sd->children list twice during removal. Performance optimization during removal just isn't worth it. Make sysfs_add/remove_one() call sysfs_link/unlink_sibing() implicitly. This makes code simpler albeit slightly less efficient. This change doesn't introduce any noticeable behavior change. Signed-off-by: Tejun Heo <htejun@gmail.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
ff869de7bf
commit
41fc1c2745
@@ -189,25 +189,16 @@ void sysfs_instantiate(struct dentry *dentry, struct inode *inode)
|
||||
int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)
|
||||
{
|
||||
struct sysfs_addrm_cxt acxt;
|
||||
struct sysfs_dirent **pos, *sd;
|
||||
struct sysfs_dirent *sd;
|
||||
|
||||
if (!dir_sd)
|
||||
return -ENOENT;
|
||||
|
||||
sysfs_addrm_start(&acxt, dir_sd);
|
||||
|
||||
for (pos = &dir_sd->s_children; *pos; pos = &(*pos)->s_sibling) {
|
||||
sd = *pos;
|
||||
|
||||
if (!sysfs_type(sd))
|
||||
continue;
|
||||
if (!strcmp(sd->s_name, name)) {
|
||||
*pos = sd->s_sibling;
|
||||
sd->s_sibling = NULL;
|
||||
sysfs_remove_one(&acxt, sd);
|
||||
break;
|
||||
}
|
||||
}
|
||||
sd = sysfs_find_dirent(dir_sd, name);
|
||||
if (sd)
|
||||
sysfs_remove_one(&acxt, sd);
|
||||
|
||||
if (sysfs_addrm_finish(&acxt))
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user