From htejun@gmail.com Mon Aug 20 05:36:58 2007 From: Tejun Heo Date: Mon, 20 Aug 2007 21:36:30 +0900 Subject: [PATCH 12/14] sysfs: kill SYSFS_FLAG_REMOVED To: ebiederm@xmission.com, cornelia.huck@de.ibm.com, greg@kroah.com, linux-kernel@vger.kernel.org, satyam@infradead.org, stern@rowland.harvard.edu, containers@lists.osdl.org, htejun@gmail.com Cc: Tejun Heo Message-ID: <11876133902374-git-send-email-htejun@gmail.com> With sysfs_get_dentry() simplified, there's no user of SYSFS_FLAG_REMOVED left. Kill it. Signed-off-by: Tejun Heo Cc: Eric W. Biederman Cc: Cornelia Huck Signed-off-by: Greg Kroah-Hartman --- fs/sysfs/dir.c | 5 +---- include/linux/sysfs.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -222,7 +222,7 @@ static void sysfs_deactivate(struct sysf DECLARE_COMPLETION_ONSTACK(wait); int v; - BUG_ON(sd->s_sibling || !(sd->s_flags & SYSFS_FLAG_REMOVED)); + BUG_ON(sd->s_sibling); sd->s_sibling = (void *)&wait; /* atomic_add_return() is a mb(), put_active() will always see @@ -462,11 +462,8 @@ int sysfs_add_one(struct sysfs_addrm_cxt */ 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; --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -83,7 +83,6 @@ 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