Home » Mailing list archives » linux-kernel » 2007 » September » 20

[PATCH 01/15] sysfs: kill SYSFS_FLAG_REMOVED

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Tejun Heo <htejun@...>
To: <ebiederm@...>, <cornelia.huck@...>, <greg@...>, <stern@...>, <kay.sievers@...>, <linux-kernel@...>, <htejun@...>
Cc: Tejun Heo <htejun@...>
Subject: [PATCH 01/15] sysfs: kill SYSFS_FLAG_REMOVED
Date: Thursday, September 20, 2007 - 3:05 am

With sysfs_get_dentry() simplified, there's no user of
SYSFS_FLAG_REMOVED left.  Kill it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
---
This patch reverts driver/sysfs-kill-sysfs_flag_removed.patch and thus
can be removed together with it.

 fs/sysfs/dir.c        |    5 ++++-
 include/linux/sysfs.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index a493c6f..da4bb66 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -222,7 +222,7 @@ static void sysfs_deactivate(struct sysfs_dirent *sd)
 	DECLARE_COMPLETION_ONSTACK(wait);
 	int v;
 
-	BUG_ON(sd->s_sibling);
+	BUG_ON(sd->s_sibling || !(sd->s_flags & SYSFS_FLAG_REMOVED));
 	sd->s_sibling = (void *)&wait;
 
 	/* atomic_add_return() is a mb(), put_active() will always see
@@ -462,8 +462,11 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
  */
 void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
 {
+	BUG_ON(sd->s_flags & SYSFS_FLAG_REMOVED);
+
 	sysfs_unlink_sibling(sd);
 
+	sd->s_flags |= SYSFS_FLAG_REMOVED;
 	sd->s_sibling = acxt->removed;
 	acxt->removed = sd;
 
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 82c31b2..c16e4c5 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -83,6 +83,7 @@ struct sysfs_ops {
 #define SYSFS_COPY_NAME		(SYSFS_DIR | SYSFS_KOBJ_LINK)
 
 #define SYSFS_FLAG_MASK		~SYSFS_TYPE_MASK
+#define SYSFS_FLAG_REMOVED	0x0100
 
 #ifdef CONFIG_SYSFS
 
-- 
1.5.0.3


-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCHSET 1/4] sysfs: misc updates, Tejun Heo, (Thu Sep 20, 3:05 am)
Re: [PATCHSET 1/4] sysfs: misc updates, Cornelia Huck, (Wed Sep 26, 7:04 am)
Re: [PATCHSET 1/4] sysfs: misc updates, Greg KH, (Wed Sep 26, 11:19 am)
[PATCH 13/15] sysfs: move sysfs_dirent-&gt;s_children into s..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 12/15] sysfs: make sysfs_root a regular directory dir..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 14/15] sysfs: implement sysfs_open_dirent, Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 15/15] sysfs: move sysfs file poll implementation to ..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 06/15] sysfs: reposition sysfs_dirent-&gt;s_mode., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 11/15] sysfs: open code sysfs_attach_dentry(), Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 10/15] sysfs: make s_elem an anonymous union, Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 09/15] sysfs: make bin attr open get active reference..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 08/15] sysfs: kill unnecessary NULL pointer check in ..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 05/15] sysfs: kill sysfs_update_file(), Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 07/15] sysfs: kill unnecessary sysfs_get() in open pa..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 04/15] sysfs: clean up header files, Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 01/15] sysfs: kill SYSFS_FLAG_REMOVED, Tejun Heo, (Thu Sep 20, 3:05 am)
Re: [PATCH 01/15] sysfs: kill SYSFS_FLAG_REMOVED, Greg KH, (Tue Sep 25, 5:32 pm)
[PATCH 03/15] sysfs: fix sysfs_chmod_file() such that it upd..., Tejun Heo, (Thu Sep 20, 3:05 am)
[PATCH 02/15] sysfs: fix comments of sysfs_add/remove_one(), Tejun Heo, (Thu Sep 20, 3:05 am)