sysfs: add sysfs_dirent->s_name
Add s_name to sysfs_dirent. This is to further reduce dependency to the associated dentry. Name is copied for directories and symlinks but not for attributes. Where possible, name dereferences are converted to use sd->s_name. sysfs_symlink->link_name and sysfs_get_name() are unused now and removed. This change allows symlink to be implemented using sysfs_dirent tree proper, which is the last remaining dentry-dependent sysfs walk. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
13b3086d2e
commit
0c096b507f
@@ -191,37 +191,6 @@ int sysfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *))
|
||||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the name for corresponding element represented by the given sysfs_dirent
|
||||
*/
|
||||
const unsigned char * sysfs_get_name(struct sysfs_dirent *sd)
|
||||
{
|
||||
struct attribute * attr;
|
||||
struct bin_attribute * bin_attr;
|
||||
struct sysfs_symlink * sl;
|
||||
|
||||
BUG_ON(!sd || !sd->s_element);
|
||||
|
||||
switch (sd->s_type) {
|
||||
case SYSFS_DIR:
|
||||
/* Always have a dentry so use that */
|
||||
return sd->s_dentry->d_name.name;
|
||||
|
||||
case SYSFS_KOBJ_ATTR:
|
||||
attr = sd->s_element;
|
||||
return attr->name;
|
||||
|
||||
case SYSFS_KOBJ_BIN_ATTR:
|
||||
bin_attr = sd->s_element;
|
||||
return bin_attr->attr.name;
|
||||
|
||||
case SYSFS_KOBJ_LINK:
|
||||
sl = sd->s_element;
|
||||
return sl->link_name;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline void orphan_all_buffers(struct inode *node)
|
||||
{
|
||||
struct sysfs_buffer_collection *set;
|
||||
@@ -305,7 +274,7 @@ int sysfs_hash_and_remove(struct dentry * dir, const char * name)
|
||||
list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
|
||||
if (!sd->s_element)
|
||||
continue;
|
||||
if (!strcmp(sysfs_get_name(sd), name)) {
|
||||
if (!strcmp(sd->s_name, name)) {
|
||||
list_del_init(&sd->s_sibling);
|
||||
sysfs_drop_dentry(sd, dir);
|
||||
sysfs_put(sd);
|
||||
|
Reference in New Issue
Block a user