From: Tejun Heo <tj@kernel.org>
To: gregkh@linuxfoundation.org
Cc: kay@vrfy.org, linux-kernel@vger.kernel.org,
ebiederm@xmission.com, bhelgaas@google.com,
Tejun Heo <tj@kernel.org>
Subject: [PATCH 08/34] sysfs, kernfs: introduce kernfs_remove[_by_name[_ns]]()
Date: Thu, 24 Oct 2013 11:49:14 -0400 [thread overview]
Message-ID: <1382629780-10006-9-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1382629780-10006-1-git-send-email-tj@kernel.org>
Introduce kernfs removal interfaces - kernfs_remove() and
kernfs_remove_by_name[_ns]().
These are just renames of sysfs_remove() and sysfs_hash_and_remove().
No functional changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
---
fs/sysfs/dir.c | 20 ++++++++++----------
fs/sysfs/file.c | 6 +++---
fs/sysfs/group.c | 15 +++++++--------
fs/sysfs/symlink.c | 4 ++--
fs/sysfs/sysfs.h | 3 ---
include/linux/kernfs.h | 24 ++++++++++++++++++++++++
6 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index bec4466..58a7779 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -824,8 +824,8 @@ static struct sysfs_dirent *sysfs_next_descendant_post(struct sysfs_dirent *pos,
return pos->s_parent;
}
-static void __sysfs_remove(struct sysfs_addrm_cxt *acxt,
- struct sysfs_dirent *sd)
+static void __kernfs_remove(struct sysfs_addrm_cxt *acxt,
+ struct sysfs_dirent *sd)
{
struct sysfs_dirent *pos, *next;
@@ -844,22 +844,22 @@ static void __sysfs_remove(struct sysfs_addrm_cxt *acxt,
}
/**
- * sysfs_remove - remove a sysfs_dirent recursively
+ * kernfs_remove - remove a sysfs_dirent recursively
* @sd: the sysfs_dirent to remove
*
* Remove @sd along with all its subdirectories and files.
*/
-void sysfs_remove(struct sysfs_dirent *sd)
+void kernfs_remove(struct sysfs_dirent *sd)
{
struct sysfs_addrm_cxt acxt;
sysfs_addrm_start(&acxt);
- __sysfs_remove(&acxt, sd);
+ __kernfs_remove(&acxt, sd);
sysfs_addrm_finish(&acxt);
}
/**
- * sysfs_hash_and_remove - find a sysfs_dirent by name and remove it
+ * kernfs_remove_by_name_ns - find a sysfs_dirent by name and remove it
* @dir_sd: parent of the target
* @name: name of the sysfs_dirent to remove
* @ns: namespace tag of the sysfs_dirent to remove
@@ -867,8 +867,8 @@ void sysfs_remove(struct sysfs_dirent *sd)
* Look for the sysfs_dirent with @name and @ns under @dir_sd and remove
* it. Returns 0 on success, -ENOENT if such entry doesn't exist.
*/
-int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name,
- const void *ns)
+int kernfs_remove_by_name_ns(struct sysfs_dirent *dir_sd, const char *name,
+ const void *ns)
{
struct sysfs_addrm_cxt acxt;
struct sysfs_dirent *sd;
@@ -883,7 +883,7 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name,
sd = sysfs_find_dirent(dir_sd, name, ns);
if (sd)
- __sysfs_remove(&acxt, sd);
+ __kernfs_remove(&acxt, sd);
sysfs_addrm_finish(&acxt);
@@ -911,7 +911,7 @@ void sysfs_remove_dir(struct kobject *kobj)
if (sd) {
WARN_ON_ONCE(sysfs_type(sd) != SYSFS_DIR);
- sysfs_remove(sd);
+ kernfs_remove(sd);
}
}
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 0d7368d4..6e9c92e 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -953,7 +953,7 @@ void sysfs_remove_file_ns(struct kobject *kobj, const struct attribute *attr,
{
struct sysfs_dirent *dir_sd = kobj->sd;
- sysfs_hash_and_remove(dir_sd, attr->name, ns);
+ kernfs_remove_by_name_ns(dir_sd, attr->name, ns);
}
EXPORT_SYMBOL_GPL(sysfs_remove_file_ns);
@@ -981,7 +981,7 @@ void sysfs_remove_file_from_group(struct kobject *kobj,
else
dir_sd = sysfs_get(kobj->sd);
if (dir_sd) {
- sysfs_hash_and_remove(dir_sd, attr->name, NULL);
+ kernfs_remove_by_name(dir_sd, attr->name);
sysfs_put(dir_sd);
}
}
@@ -1009,7 +1009,7 @@ EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
void sysfs_remove_bin_file(struct kobject *kobj,
const struct bin_attribute *attr)
{
- sysfs_hash_and_remove(kobj->sd, attr->attr.name, NULL);
+ kernfs_remove_by_name(kobj->sd, attr->attr.name);
}
EXPORT_SYMBOL_GPL(sysfs_remove_bin_file);
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 1898a10..4bd9973 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -26,7 +26,7 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
if (grp->attrs)
for (attr = grp->attrs; *attr; attr++)
- sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
+ kernfs_remove_by_name(dir_sd, (*attr)->name);
if (grp->bin_attrs)
for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++)
sysfs_remove_bin_file(kobj, *bin_attr);
@@ -49,8 +49,7 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj,
* re-adding (if required) the file.
*/
if (update)
- sysfs_hash_and_remove(dir_sd, (*attr)->name,
- NULL);
+ kernfs_remove_by_name(dir_sd, (*attr)->name);
if (grp->is_visible) {
mode = grp->is_visible(kobj, *attr, i);
if (!mode)
@@ -111,7 +110,7 @@ static int internal_create_group(struct kobject *kobj, int update,
error = create_files(sd, kobj, grp, update);
if (error) {
if (grp->name)
- sysfs_remove(sd);
+ kernfs_remove(sd);
}
sysfs_put(sd);
return error;
@@ -219,7 +218,7 @@ void sysfs_remove_group(struct kobject *kobj,
remove_files(sd, kobj, grp);
if (grp->name)
- sysfs_remove(sd);
+ kernfs_remove(sd);
sysfs_put(sd);
}
@@ -270,7 +269,7 @@ int sysfs_merge_group(struct kobject *kobj,
error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);
if (error) {
while (--i >= 0)
- sysfs_hash_and_remove(dir_sd, (*--attr)->name, NULL);
+ kernfs_remove_by_name(dir_sd, (*--attr)->name);
}
sysfs_put(dir_sd);
@@ -292,7 +291,7 @@ void sysfs_unmerge_group(struct kobject *kobj,
dir_sd = sysfs_get_dirent(kobj->sd, grp->name);
if (dir_sd) {
for (attr = grp->attrs; *attr; ++attr)
- sysfs_hash_and_remove(dir_sd, (*attr)->name, NULL);
+ kernfs_remove_by_name(dir_sd, (*attr)->name);
sysfs_put(dir_sd);
}
}
@@ -335,7 +334,7 @@ void sysfs_remove_link_from_group(struct kobject *kobj, const char *group_name,
dir_sd = sysfs_get_dirent(kobj->sd, group_name);
if (dir_sd) {
- sysfs_hash_and_remove(dir_sd, link_name, NULL);
+ kernfs_remove_by_name(dir_sd, link_name);
sysfs_put(dir_sd);
}
}
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index 22ea2f5..996d861 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -144,7 +144,7 @@ void sysfs_delete_link(struct kobject *kobj, struct kobject *targ,
if (targ->sd)
ns = targ->sd->s_ns;
spin_unlock(&sysfs_assoc_lock);
- sysfs_hash_and_remove(kobj->sd, name, ns);
+ kernfs_remove_by_name_ns(kobj->sd, name, ns);
}
/**
@@ -161,7 +161,7 @@ void sysfs_remove_link(struct kobject *kobj, const char *name)
else
parent_sd = kobj->sd;
- sysfs_hash_and_remove(parent_sd, name, NULL);
+ kernfs_remove_by_name(parent_sd, name);
}
EXPORT_SYMBOL_GPL(sysfs_remove_link);
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 05d063f..506f5d0 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -173,9 +173,6 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd);
int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
struct sysfs_dirent *parent_sd);
-void sysfs_remove(struct sysfs_dirent *sd);
-int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name,
- const void *ns);
void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 254b9e8..ad0483a 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -7,6 +7,30 @@
#ifndef __LINUX_KERNFS_H
#define __LINUX_KERNFS_H
+#include <linux/kernel.h>
+
struct sysfs_dirent;
+#ifdef CONFIG_SYSFS
+
+void kernfs_remove(struct sysfs_dirent *sd);
+int kernfs_remove_by_name_ns(struct sysfs_dirent *parent, const char *name,
+ const void *ns);
+
+#else /* CONFIG_SYSFS */
+
+static inline void kernfs_remove(struct sysfs_dirent *sd) { }
+
+static inline int kernfs_remove_by_name_ns(struct sysfs_dirent *parent,
+ const char *name, const void *ns)
+{ return 0; }
+
+#endif /* CONFIG_SYSFS */
+
+static inline int kernfs_remove_by_name(struct sysfs_dirent *parent,
+ const char *name)
+{
+ return kernfs_remove_by_name_ns(parent, name, NULL);
+}
+
#endif /* __LINUX_KERNFS_H */
--
1.8.3.1
next prev parent reply other threads:[~2013-10-24 15:57 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 15:49 Subject: [PATCHSET driver-core-next] sysfs: separate out kernfs, part #1 Tejun Heo
2013-10-24 15:49 ` [PATCH 01/34] sysfs: merge sysfs_elem_bin_attr into sysfs_elem_attr Tejun Heo
2013-10-24 15:49 ` [PATCH 02/34] sysfs: honor bin_attr.attr.ignore_lockdep Tejun Heo
2013-10-24 15:49 ` [PATCH 03/34] sysfs: remove unused sysfs_get_dentry() prototype Tejun Heo
2013-10-24 15:49 ` [PATCH 04/34] sysfs: move sysfs_hash_and_remove() to fs/sysfs/dir.c Tejun Heo
2013-10-24 15:49 ` [PATCH 05/34] sysfs: separate out dup filename warning into a separate function Tejun Heo
2013-10-24 15:49 ` [PATCH 06/34] sysfs: make __sysfs_add_one() fail if the parent isn't a directory Tejun Heo
2013-10-24 15:49 ` [PATCH 07/34] sysfs, kernfs: add skeletons for kernfs Tejun Heo
2013-10-24 15:49 ` Tejun Heo [this message]
2013-10-24 15:49 ` [PATCH 09/34] sysfs, kernfs: introduce kernfs_create_link() Tejun Heo
2013-10-24 15:49 ` [PATCH 10/34] sysfs, kernfs: introduce kernfs_rename[_ns]() Tejun Heo
2013-10-24 15:49 ` [PATCH 11/34] sysfs, kernfs: introduce kernfs_setattr() Tejun Heo
2013-10-24 15:49 ` [PATCH 12/34] sysfs, kernfs: replace sysfs_dirent->s_dir.kobj and ->s_attr.[bin_]attr with ->priv Tejun Heo
2013-10-24 15:49 ` [PATCH 13/34] sysfs, kernfs: introduce kernfs_create_dir[_ns]() Tejun Heo
2013-10-24 15:49 ` [PATCH 14/34] sysfs, kernfs: prepare read path for kernfs Tejun Heo
2013-10-26 11:32 ` Pavel Machek
2013-10-27 11:30 ` Tejun Heo
2013-10-28 13:03 ` [PATCH v2 " Tejun Heo
2013-10-28 16:33 ` [PATCH v3 " Tejun Heo
2013-10-24 15:49 ` [PATCH 15/34] sysfs, kernfs: prepare write " Tejun Heo
2013-10-24 15:49 ` [PATCH 16/34] sysfs, kernfs: prepare llseek " Tejun Heo
2013-10-24 15:49 ` [PATCH 17/34] sysfs, kernfs: prepare mmap " Tejun Heo
2013-10-24 15:49 ` [PATCH 18/34] sysfs, kernfs: prepare open, release, poll paths " Tejun Heo
2013-10-24 15:49 ` [PATCH 19/34] sysfs, kernfs: move sysfs_open_file to include/linux/kernfs.h Tejun Heo
2013-10-24 15:49 ` [PATCH 20/34] sysfs, kernfs: introduce kernfs_ops Tejun Heo
2013-10-24 15:49 ` [PATCH 21/34] sysfs, kernfs: add sysfs_dirent->s_attr.size Tejun Heo
2013-10-24 15:49 ` [PATCH 22/34] sysfs, kernfs: remove SYSFS_KOBJ_BIN_ATTR Tejun Heo
2013-10-24 15:49 ` [PATCH 23/34] sysfs, kernfs: introduce kernfs_create_file[_ns]() Tejun Heo
2013-10-24 15:49 ` [PATCH 24/34] sysfs, kernfs: remove sysfs_add_one() Tejun Heo
2013-10-24 15:49 ` [PATCH 25/34] sysfs, kernfs: add kernfs_ops->seq_{start|next|stop}() Tejun Heo
2013-10-28 13:04 ` [PATCH v2 " Tejun Heo
2013-10-24 15:49 ` [PATCH 26/34] sysfs, kernfs: introduce kernfs_notify() Tejun Heo
2013-10-24 15:49 ` [PATCH 27/34] sysfs, kernfs: reorganize SYSFS_* constants Tejun Heo
2013-10-24 15:49 ` [PATCH 28/34] sysfs, kernfs: revamp sysfs_dirent active_ref lockdep annotation Tejun Heo
2013-10-24 15:49 ` [PATCH 29/34] sysfs, kernfs: introduce kernfs[_find_and]_get() and kernfs_put() Tejun Heo
2013-10-24 15:49 ` [PATCH 30/34] sysfs, kernfs: move internal decls to fs/kernfs/kernfs-internal.h Tejun Heo
2013-10-24 15:49 ` [PATCH 31/34] sysfs, kernfs: move inode code to fs/kernfs/inode.c Tejun Heo
2013-10-24 15:49 ` [PATCH 32/34] sysfs, kernfs: move dir core code to fs/kernfs/dir.c Tejun Heo
2013-10-24 15:49 ` [PATCH 33/34] sysfs, kernfs: move file core code to fs/kernfs/file.c Tejun Heo
2013-10-28 13:04 ` [PATCH v2 " Tejun Heo
2013-10-28 16:34 ` [PATCH v3 " Tejun Heo
2013-10-24 15:49 ` [PATCH 34/34] sysfs, kernfs: move symlink core code to fs/kernfs/symlink.c Tejun Heo
2013-10-28 13:06 ` Subject: [PATCHSET driver-core-next] sysfs: separate out kernfs, part #1 Tejun Heo
2013-10-28 16:35 ` Tejun Heo
2013-10-29 22:29 ` Greg KH
2013-10-30 14:41 ` 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=1382629780-10006-9-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=bhelgaas@google.com \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=kay@vrfy.org \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).