All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org,
	cornelia.huck-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org,
	greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	satyam-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
	stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org,
	containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org
Cc: Tejun Heo <htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 12/14] sysfs: kill SYSFS_FLAG_REMOVED
Date: Mon, 20 Aug 2007 21:36:30 +0900	[thread overview]
Message-ID: <11876133902374-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <11876133893720-git-send-email-htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

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

Signed-off-by: Tejun Heo <htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 fs/sysfs/dir.c        |    5 +----
 include/linux/sysfs.h |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index c55c811..1752342 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 || !(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 *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 c16e4c5..82c31b2 100644
--- 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
 
-- 
1.5.0.3

WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <htejun@gmail.com>
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 <htejun@gmail.com>
Subject: [PATCH 12/14] sysfs: kill SYSFS_FLAG_REMOVED
Date: Mon, 20 Aug 2007 21:36:30 +0900	[thread overview]
Message-ID: <11876133902374-git-send-email-htejun@gmail.com> (raw)
In-Reply-To: <11876133893720-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 <htejun@gmail.com>
---
 fs/sysfs/dir.c        |    5 +----
 include/linux/sysfs.h |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index c55c811..1752342 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 || !(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 *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 c16e4c5..82c31b2 100644
--- 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
 
-- 
1.5.0.3



  parent reply	other threads:[~2007-08-20 12:36 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-20 12:36 [PATCHSET] Sysfs cleanups from Eric W. Biederman Tejun Heo
2007-08-20 12:36 ` [PATCH 01/14] sysfs: fix i_mutex locking in sysfs_get_dentry() Tejun Heo
2007-08-20 12:36   ` Tejun Heo
2007-08-20 12:36 ` [PATCH 10/14] sysfs: simply sysfs_get_dentry Tejun Heo
2007-08-20 12:36   ` Tejun Heo
     [not found] ` <11876133893720-git-send-email-htejun-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2007-08-20 12:36   ` [PATCH 02/14] sysfs: Move all of inode initialization into sysfs_init_inode Tejun Heo
2007-08-20 12:36   ` [PATCH 03/14] sysfs: Remove sysfs_instantiate Tejun Heo
2007-08-20 12:36   ` [PATCH 04/14] sysfs: Use kill_anon_super Tejun Heo
2007-08-20 12:36   ` [PATCH 11/14] sysfs: Remove s_dentry Tejun Heo
2007-08-20 12:36   ` [PATCH 08/14] sysfs: Rewrite sysfs_drop_dentry Tejun Heo
2007-08-20 12:36   ` Tejun Heo [this message]
2007-08-20 12:36     ` [PATCH 12/14] sysfs: kill SYSFS_FLAG_REMOVED Tejun Heo
2007-08-20 12:36   ` [PATCH 07/14] sysfs: Simplify readdir Tejun Heo
2007-08-20 12:36   ` [PATCH 05/14] sysfs: Make sysfs_mount static Tejun Heo
2007-08-20 12:36   ` [PATCH 09/14] sysfs: Introduce sysfs_rename_mutex Tejun Heo
2007-08-20 12:36   ` [PATCH 06/14] sysfs: In sysfs_lookup don't open code sysfs_find_dirent Tejun Heo
2007-08-20 12:36   ` [PATCH 13/14] sysfs: Rewrite rename in terms of sysfs dirents Tejun Heo
2007-08-20 12:36   ` [PATCH 14/14] sysfs: Rewrite sysfs_move_dir " Tejun Heo
2007-08-22 14:04   ` [PATCHSET] Sysfs cleanups from Eric W. Biederman Eric W. Biederman
2007-08-22 14:04     ` Eric W. Biederman
2007-08-22 14:45     ` Tejun Heo
2007-08-22 15:51       ` Eric W. Biederman
2007-08-22  9:26 ` Cornelia Huck
2007-08-22  9:39   ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11876133902374-git-send-email-htejun@gmail.com \
    --to=htejun-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org \
    --cc=cornelia.huck-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org \
    --cc=ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org \
    --cc=greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=satyam-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.