Home » Mailing lists » Devel » [PATCH 0/25] Sysfs cleanups & tagged directory support
[PATCH 11/25] sysfs: Remove s_dentry [message #19573 is a reply to message #19572] |
Tue, 07 August 2007 21:19 |
ebiederm
Messages: 1354 Registered: February 2006
|
Senior Member |
|
|
The only uses of s_dentry left are the code that maintains
s_dentry and trivial users that don't actually need it.
So this patch removes the s_dentry maintenance code and
restructures the trivial uses to use something else.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
fs/sysfs/dir.c | 32 ++++----------------------------
fs/sysfs/mount.c | 1 -
fs/sysfs/sysfs.h | 1 -
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index adb1b01..1078e60 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -247,22 +247,7 @@ static void sysfs_d_iput(struct dentry * dentry, struct inode * inode)
{
struct sysfs_dirent * sd = dentry->d_fsdata;
- if (sd) {
- /* sd->s_dentry is protected with sysfs_assoc_lock.
- * This allows sysfs_drop_dentry() to dereference it.
- */
- spin_lock(&sysfs_assoc_lock);
-
- /* The dentry might have been deleted or another
- * lookup could have happened updating sd->s_dentry to
- * point the new dentry. Ignore if it isn't pointing
- * to this dentry.
- */
- if (sd->s_dentry == dentry)
- sd->s_dentry = NULL;
- spin_unlock(&sysfs_assoc_lock);
- sysfs_put(sd);
- }
+ sysfs_put(sd);
iput(inode);
}
@@ -310,9 +295,6 @@ struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type)
* @sd: target sysfs_dirent
* @dentry: dentry to associate
*
- * Associate @sd with @dentry. This is protected by
- * sysfs_assoc_lock to avoid race with sysfs_d_iput().
- *
* LOCKING:
* mutex_lock(sysfs_mutex)
*/
@@ -320,12 +302,6 @@ static void sysfs_attach_dentry(struct sysfs_dirent *sd, struct dentry *dentry)
{
dentry->d_op = &sysfs_dentry_ops;
dentry->d_fsdata = sysfs_get(sd);
-
- /* protect sd->s_dentry against sysfs_d_iput */
- spin_lock(&sysfs_assoc_lock);
- sd->s_dentry = dentry;
- spin_unlock(&sysfs_assoc_lock);
-
d_rehash(dentry);
}
@@ -927,7 +903,7 @@ int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
/* rename */
d_add(new_dentry, NULL);
- d_move(sd->s_dentry, new_dentry);
+ d_move(old_dentry, new_dentry);
error = 0;
goto out_unlock;
@@ -960,7 +936,7 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
error = PTR_ERR(old_dentry);
goto out_dput;
}
- old_parent = sd->s_parent->s_dentry;
+ old_parent = old_dentry->d_parent;
new_parent = sysfs_get_dentry(new_parent_sd);
if (IS_ERR(new_parent)) {
@@ -986,7 +962,7 @@ again:
} else
error = 0;
d_add(new_dentry, NULL);
- d_move(sd->s_dentry, new_dentry);
+ d_move(old_dentry, new_dentry);
dput(new_dentry);
/* Remove from old parent's list and insert into new parent's list. */
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 9fae7d5..4968d31 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -57,7 +57,6 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)
iput(inode);
return -ENOMEM;
}
- sysfs_root.s_dentry = root;
root->d_fsdata = &sysfs_root;
sb->s_root = root;
return 0;
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 77253aa..8ed13cf 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -37,7 +37,6 @@ struct sysfs_dirent {
unsigned int s_flags;
umode_t s_mode;
ino_t s_ino;
- struct dentry * s_dentry;
struct iattr * s_iattr;
atomic_t s_event;
};
--
1.5.1.1.181.g2de0
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
|
|
|
|
|
[PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Tue, 07 August 2007 21:06
|
|
|
[PATCH 01/25] sysfs: Move all of inode initialization into sysfs_init_inode
By: ebiederm on Tue, 07 August 2007 21:08
|
|
|
[PATCH 02/25] sysfs: Remove sysfs_instantiate
By: ebiederm on Tue, 07 August 2007 21:08
|
|
|
[PATCH 03/25] sysfs: Use kill_anon_super
By: ebiederm on Tue, 07 August 2007 21:10
|
|
|
[PATCH 04/25] sysfs: Make sysfs_mount static
By: ebiederm on Tue, 07 August 2007 21:11
|
|
|
[PATCH 05/25] sysfs: In sysfs_lookup don't open code sysfs_find_dirent
By: ebiederm on Tue, 07 August 2007 21:12
|
|
|
[PATCH 06/25] sysfs: Simplify readdir.
By: ebiederm on Tue, 07 August 2007 21:13
|
|
|
[PATCH 07/25] sysfs: Rewrite sysfs_drop_dentry.
By: ebiederm on Tue, 07 August 2007 21:14
|
|
|
[PATCH 08/25] sysfs: Implement __sysfs_get_dentry
By: ebiederm on Tue, 07 August 2007 21:16
|
|
|
[PATCH 09/25] sysfs: Move sysfs_get_dentry below __sysfs_get_dentry
By: ebiederm on Tue, 07 August 2007 21:17
|
|
|
[PATCH 10/25] sysfs: Rewrite sysfs_get_dentry in terms of __sysfs_get_dentry
By: ebiederm on Tue, 07 August 2007 21:18
|
|
|
[PATCH 11/25] sysfs: Remove s_dentry
By: ebiederm on Tue, 07 August 2007 21:19
|
|
|
[PATCH 12/25] sysfs: Introduce sysfs_rename_mutex
By: ebiederm on Tue, 07 August 2007 21:21
|
|
|
[PATCH 13/25] sysfs: Simply sysfs_get_dentry
By: ebiederm on Tue, 07 August 2007 21:22
|
|
|
[PATCH 14/25] sysfs: Don't use lookup_one_len_kern
By: ebiederm on Tue, 07 August 2007 21:23
|
|
|
[PATCH 15/25] vfs: Remove lookup_one_len_kern
By: ebiederm on Tue, 07 August 2007 21:25
|
|
|
[PATCH 16/25] sysfs: Support for preventing unmounts.
By: ebiederm on Tue, 07 August 2007 21:26
|
|
|
[PATCH 17/25] sysfs: Rewrite rename in terms of sysfs dirents
By: ebiederm on Tue, 07 August 2007 21:27
|
|
|
[PATCH 18/25] sysfs: Rewrite sysfs_move_dir in terms of sysfs dirents
By: ebiederm on Tue, 07 August 2007 21:28
|
|
|
[PATCH 19/25] sysfs: sysfs_get_dentry add a sb parameter
By: ebiederm on Tue, 07 August 2007 21:29
|
|
|
[PATCH 20/25] sysfs: Rename Support multiple superblocks
By: ebiederm on Tue, 07 August 2007 21:31
|
|
|
[PATCH 21/25] sysfs: sysfs_chmod_file handle multiple superblocks
By: ebiederm on Tue, 07 August 2007 21:32
|
|
|
[PATCH 22/25] sysfs: sysfs_uptdate_file handle multiple superblocks
By: ebiederm on Tue, 07 August 2007 21:34
|
|
|
[PATCH 23/25] sysfs: Implement sysfs tagged directory support.
By: ebiederm on Tue, 07 August 2007 21:35
|
|
|
[PATCH 24/25] sysfs: Implement sysfs_delete_link and sysfs_rename_link
By: ebiederm on Tue, 07 August 2007 21:36
|
|
|
[PATCH 25/25] driver core: Implement tagged directory support for device classes.
By: ebiederm on Tue, 07 August 2007 21:36
|
|
|
Re: alternative approached at tagged nodes
|
|
|
Re: [PATCH 22/25] sysfs: sysfs_uptdate_file handle multiple superblocks
|
|
|
Re: [PATCH 21/25] sysfs: sysfs_chmod_file handle multiple superblocks
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
By: ebiederm on Wed, 08 August 2007 15:45
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
By: ebiederm on Wed, 08 August 2007 16:35
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
By: ebiederm on Wed, 08 August 2007 16:55
|
|
|
Re: [PATCH 20/25] sysfs: Rename Support multiple superblocks
|
|
|
Re: [PATCH 19/25] sysfs: sysfs_get_dentry add a sb parameter
By: ebiederm on Wed, 08 August 2007 15:34
|
|
|
Re: [PATCH 19/25] sysfs: sysfs_get_dentry add a sb parameter
|
|
|
Re: [PATCH 18/25] sysfs: Rewrite sysfs_move_dir in terms of sysfs dirents
|
|
|
Re: [PATCH 17/25] sysfs: Rewrite rename in terms of sysfs dirents
By: ebiederm on Wed, 08 August 2007 15:32
|
|
|
Re: [PATCH 17/25] sysfs: Rewrite rename in terms of sysfs dirents
|
|
|
Re: [PATCH 15/25] vfs: Remove lookup_one_len_kern
|
|
|
Re: [PATCH 14/25] sysfs: Don't use lookup_one_len_kern
By: ebiederm on Wed, 08 August 2007 15:26
|
|
|
Re: [PATCH 14/25] sysfs: Don't use lookup_one_len_kern
|
|
|
Re: [PATCH 14/25] sysfs: Don't use lookup_one_len_kern
|
|
|
Re: [PATCH 13/25] sysfs: Simply sysfs_get_dentry
|
|
|
Re: [PATCH 12/25] sysfs: Introduce sysfs_rename_mutex
By: ebiederm on Wed, 08 August 2007 08:28
|
|
|
Re: [PATCH 12/25] sysfs: Introduce sysfs_rename_mutex
|
|
|
Re: [PATCH 12/25] sysfs: Introduce sysfs_rename_mutex
|
|
|
Re: [PATCH 11/25] sysfs: Remove s_dentry
|
|
|
Re: [PATCH 10/25] sysfs: Rewrite sysfs_get_dentry in terms of __sysfs_get_dentry
|
|
|
Re: [PATCH 09/25] sysfs: Move sysfs_get_dentry below __sysfs_get_dentry
|
|
|
Re: [PATCH 08/25] sysfs: Implement __sysfs_get_dentry
|
|
|
Re: [PATCH 07/25] sysfs: Rewrite sysfs_drop_dentry.
|
|
|
Re: [PATCH 06/25] sysfs: Simplify readdir.
|
|
|
Re: [PATCH 05/25] sysfs: In sysfs_lookup don't open code sysfs_find_dirent
|
|
|
Re: [PATCH 04/25] sysfs: Make sysfs_mount static
|
|
|
Re: [PATCH 03/25] sysfs: Use kill_anon_super
|
|
|
Re: [PATCH 02/25] sysfs: Remove sysfs_instantiate
|
|
|
Re: [PATCH 01/25] sysfs: Move all of inode initialization into sysfs_init_inode
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Wed, 08 August 2007 07:47
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Wed, 08 August 2007 07:57
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Wed, 08 August 2007 15:08
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Wed, 08 August 2007 15:53
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
By: ebiederm on Wed, 08 August 2007 16:37
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
|
|
Re: [PATCH 0/25] Sysfs cleanups & tagged directory support
|
Goto Forum:
Current Time: Mon Dec 09 05:02:11 GMT 2024
Total time taken to generate the page: 0.02759 seconds
|