lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sysfs: make kobj point to sysfs_dirent instead of dentry

Browse Source 
As kobj sysfs dentries and inodes are gonna be made reclaimable,
dentry can't be used as naming token for sysfs file/directory, replace
kobj->dentry with kobj->sd.  The only external interface change is
shadow directory handling.  All other changes are contained in kobj
and sysfs.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tejun Heo
2007-06-14 04:27:22 +09:00
committed by Greg Kroah-Hartman
parent f0b0af4792
commit 608e266a2d
10 changed files with 156 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fs/sysfs/symlink.c
View File

@@ -66,7 +66,6 @@ static int sysfs_add_link(struct sysfs_dirent * parent_sd, const char * name,
*/
int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name)
{
struct dentry *dentry = NULL;
struct sysfs_dirent *parent_sd = NULL;
struct sysfs_dirent *target_sd = NULL;
int error = -EEXIST;
@@ -75,29 +74,28 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
if (!kobj) {
if (sysfs_mount && sysfs_mount->mnt_sb)
dentry = sysfs_mount->mnt_sb->s_root;
parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;
} else
dentry = kobj->dentry;
parent_sd = kobj->sd;
if (!dentry)
if (!parent_sd)
return -EFAULT;
parent_sd = dentry->d_fsdata;
/* target->dentry can go away beneath us but is protected with
/* target->sd can go away beneath us but is protected with
* kobj_sysfs_assoc_lock. Fetch target_sd from it.
*/
spin_lock(&kobj_sysfs_assoc_lock);
if (target->dentry)
target_sd = sysfs_get(target->dentry->d_fsdata);
if (target->sd)
target_sd = sysfs_get(target->sd);
spin_unlock(&kobj_sysfs_assoc_lock);
if (!target_sd)
return -ENOENT;
mutex_lock(&dentry->d_inode->i_mutex);
if (!sysfs_find_dirent(dentry->d_fsdata, name))
mutex_lock(&parent_sd->s_dentry->d_inode->i_mutex);
if (!sysfs_find_dirent(parent_sd, name))
error = sysfs_add_link(parent_sd, name, target_sd);
mutex_unlock(&dentry->d_inode->i_mutex);
mutex_unlock(&parent_sd->s_dentry->d_inode->i_mutex);
if (error)
sysfs_put(target_sd);
@@ -114,7 +112,7 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
void sysfs_remove_link(struct kobject * kobj, const char * name)
{
sysfs_hash_and_remove(kobj->dentry,name);
sysfs_hash_and_remove(kobj->sd, name);
}
static int sysfs_get_target_path(struct sysfs_dirent * parent_sd,