sysfs: @name comes before @ns
Some internal sysfs functions which take explicit namespace argument are weird in that they place the optional @ns in front of @name which is contrary to the established convention. This is confusing and error-prone especially as @ns and @name may be interchanged without causing compilation warning. Swap the positions of @name and @ns in the following internal functions. sysfs_find_dirent() sysfs_rename() sysfs_hash_and_remove() sysfs_name_hash() sysfs_name_compare() create_dir() This patch doesn't introduce any functional changes. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Kay Sievers <kay@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
388975ccca
commit
cfec0bc835
@@ -144,7 +144,7 @@ void sysfs_delete_link(struct kobject *kobj, struct kobject *targ,
|
||||
if (targ->sd)
|
||||
ns = targ->sd->s_ns;
|
||||
spin_unlock(&sysfs_assoc_lock);
|
||||
sysfs_hash_and_remove(kobj->sd, ns, name);
|
||||
sysfs_hash_and_remove(kobj->sd, name, ns);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -161,7 +161,7 @@ void sysfs_remove_link(struct kobject *kobj, const char *name)
|
||||
else
|
||||
parent_sd = kobj->sd;
|
||||
|
||||
sysfs_hash_and_remove(parent_sd, NULL, name);
|
||||
sysfs_hash_and_remove(parent_sd, name, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sysfs_remove_link);
|
||||
|
||||
@@ -201,7 +201,7 @@ int sysfs_rename_link_ns(struct kobject *kobj, struct kobject *targ,
|
||||
if (sd->s_symlink.target_sd->s_dir.kobj != targ)
|
||||
goto out;
|
||||
|
||||
result = sysfs_rename(sd, parent_sd, new_ns, new);
|
||||
result = sysfs_rename(sd, parent_sd, new, new_ns);
|
||||
|
||||
out:
|
||||
sysfs_put(sd);
|
||||
|
Reference in New Issue
Block a user