From: ebiederm@xmission.com (Eric W. Biederman)
To: Greg Kroah-Hartman <gregkh@suse.de>, Greg KH <greg@kroah.com>
Cc: Tejun Heo <htejun@gmail.com>,
Linux Containers <containers@lists.osdl.org>,
<netdev@vger.kernel.org>,
cornelia.huck@de.ibm.com, stern@rowland.harvard.edu,
kay.sievers@vrfy.org, <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
David Miller <davem@davemloft.net>
Subject: [PATCH 08/10] sysfs: Implement sysfs_delete_link and sysfs_rename_link
Date: Sat, 01 Dec 2007 02:30:52 -0700 [thread overview]
Message-ID: <m17ijy7odv.fsf_-_@ebiederm.dsl.xmission.com> (raw)
In-Reply-To: <m1bq9a7oh8.fsf_-_@ebiederm.dsl.xmission.com> (Eric W. Biederman's message of "Sat, 01 Dec 2007 02:28:51 -0700")
When removing a symlink sysfs_remove_link does not provide enough
information to figure out which tagged directory the symlink falls in.
So I need sysfs_delete_link which is passed the target of the symlink
to delete.
Further half the time when we are removing a symlink the code is
actually renaming the symlink but not doing so explicitly because we
don't have a symlink rename method. So I have added sysfs_rename_link
as well.
Both of these functions now have enough information to find a symlink
in a tagged directory. The only restriction is that they must be
called before the target kobject is renamed or deleted. If they are
called later I loose track of which tag the target kobject was marked
with and can no longer find the old symlink to remove it.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
fs/sysfs/symlink.c | 31 +++++++++++++++++++++++++++++++
include/linux/sysfs.h | 17 +++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
index b0f8070..89c98cb 100644
--- a/fs/sysfs/symlink.c
+++ b/fs/sysfs/symlink.c
@@ -80,6 +80,21 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
}
/**
+ * sysfs_delete_link - remove symlink in object's directory.
+ * @kobj: object we're acting for.
+ * @targ: object we're pointing to.
+ * @name: name of the symlink to remove.
+ *
+ * Unlike sysfs_remove_link sysfs_delete_link has enough information
+ * to successfully delete symlinks in tagged directories.
+ */
+void sysfs_delete_link(struct kobject *kobj, struct kobject *targ,
+ const char *name)
+{
+ sysfs_hash_and_remove(targ, kobj->sd, name);
+}
+
+/**
* sysfs_remove_link - remove symlink in object's directory.
* @kobj: object we're acting for.
* @name: name of the symlink to remove.
@@ -90,6 +105,22 @@ void sysfs_remove_link(struct kobject * kobj, const char * name)
sysfs_hash_and_remove(kobj, kobj->sd, name);
}
+/**
+ * sysfs_rename_link - rename symlink in object's directory.
+ * @kobj: object we're acting for.
+ * @targ: object we're pointing to.
+ * @old: previous name of the symlink.
+ * @new: new name of the symlink.
+ *
+ * A helper function for the common rename symlink idiom.
+ */
+int sysfs_rename_link(struct kobject *kobj, struct kobject *targ,
+ const char *old, const char *new)
+{
+ sysfs_delete_link(kobj, targ, old);
+ return sysfs_create_link(kobj, targ, new);
+}
+
static int sysfs_get_target_path(struct sysfs_dirent *parent_sd,
struct sysfs_dirent *target_sd, char *path)
{
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index c8d7a69..c2e8b0d 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -109,6 +109,12 @@ int __must_check sysfs_create_link(struct kobject *kobj, struct kobject *target,
const char *name);
void sysfs_remove_link(struct kobject *kobj, const char *name);
+int sysfs_rename_link(struct kobject *kobj, struct kobject *target,
+ const char *old_name, const char *new_name);
+
+void sysfs_delete_link(struct kobject *dir, struct kobject *targ,
+ const char *name);
+
int __must_check sysfs_create_group(struct kobject *kobj,
const struct attribute_group *grp);
void sysfs_remove_group(struct kobject *kobj,
@@ -195,6 +201,17 @@ static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
;
}
+static inline int sysfs_rename_link(struct kobject * k, struct kobject *t,
+ const char *old_name, const char * new_name)
+{
+ return 0;
+}
+
+static inline void sysfs_delete_link(struct kobject *k, struct kobject *t,
+ const char *name)
+{
+}
+
static inline int sysfs_create_group(struct kobject *kobj,
const struct attribute_group *grp)
{
--
1.5.3.rc6.17.g1911
next prev parent reply other threads:[~2007-12-01 9:33 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-01 9:06 [PATCH 0/10] sysfs network namespace support Eric W. Biederman
2007-12-01 9:12 ` [PATCH 01/10] sysfs: Make sysfs_mount static again Eric W. Biederman
2007-12-01 9:13 ` [PATCH 02/10] sysfs: Support for preventing unmounts Eric W. Biederman
2007-12-01 9:16 ` [PATCH 03/10] sysfs: sysfs_get_dentry add a sb parameter Eric W. Biederman
2007-12-01 9:18 ` [PATCH 04/10] sysfs: Implement __sysfs_get_dentry Eric W. Biederman
2007-12-01 9:23 ` [PATCH 05/10] sysfs: Rename Support multiple superblocks Eric W. Biederman
2007-12-01 9:25 ` [PATCH 06/10] sysfs: sysfs_chmod_file handle " Eric W. Biederman
2007-12-01 9:28 ` [PATCH 07/10] sysfs: Implement sysfs tagged directory support Eric W. Biederman
2007-12-01 9:30 ` Eric W. Biederman [this message]
2007-12-01 9:33 ` [PATCH 09/10] driver core: Implement tagged directory support for device classes Eric W. Biederman
2007-12-01 9:35 ` [PATCH 10/10] net: Enable tagging for net_class directories in sysfs Eric W. Biederman
2007-12-01 13:10 ` namespace support requires network modules to say "GPL" Mark Lord
2007-12-01 13:13 ` Mark Lord
2007-12-01 19:17 ` Stephen Hemminger
2007-12-01 19:23 ` Alan Cox
2007-12-01 19:38 ` Stephen Hemminger
2007-12-01 19:45 ` Alan Cox
2007-12-01 20:13 ` Eric W. Biederman
2007-12-01 20:21 ` Mark Lord
2007-12-01 20:29 ` Arjan van de Ven
2007-12-01 22:12 ` Mark Lord
2007-12-01 23:13 ` Eric W. Biederman
2007-12-01 23:24 ` Jiri Slaby
2007-12-02 1:14 ` Eric W. Biederman
2007-12-01 23:51 ` Mark Lord
2007-12-02 1:08 ` Eric W. Biederman
2007-12-01 20:52 ` Eric W. Biederman
2007-12-01 22:13 ` Mark Lord
2007-12-03 0:02 ` David Schwartz
2007-12-03 0:14 ` Alan Cox
2007-12-01 19:54 ` Eric W. Biederman
2007-12-02 0:30 ` Stephen Hemminger
2007-12-02 2:02 ` Eric W. Biederman
2007-12-02 3:34 ` Mark Lord
2007-12-02 4:23 ` Stephen Hemminger
2007-12-02 19:28 ` Ben Greear
2007-12-02 20:03 ` Patrick McHardy
2007-12-02 20:43 ` Adrian Bunk
2007-12-02 21:59 ` Patrick McHardy
2007-12-03 1:14 ` Adrian Bunk
2007-12-03 8:33 ` Denis V. Lunev
2007-12-03 17:35 ` Eric W. Biederman
2007-12-03 18:19 ` Ben Greear
2007-12-03 18:57 ` Daniel Lezcano
2007-12-04 15:19 ` Daniel Lezcano
2007-12-04 18:03 ` Eric W. Biederman
2007-12-04 18:44 ` Ben Greear
2007-12-04 19:17 ` Eric W. Biederman
2007-12-04 19:35 ` Ben Greear
2007-12-04 20:09 ` Eric W. Biederman
2007-12-05 6:14 ` David Miller
2007-12-05 6:01 ` David Miller
2007-12-04 17:59 ` Eric W. Biederman
2007-12-04 18:57 ` Ben Greear
2007-12-04 20:01 ` Eric W. Biederman
2007-12-05 6:07 ` David Miller
2007-12-03 8:24 ` Romano Giannetti
2007-12-03 15:34 ` Arjan van de Ven
2007-12-03 18:03 ` Eric W. Biederman
2007-12-03 18:13 ` David Miller
2007-12-02 13:51 ` Alan Cox
2007-12-02 19:56 ` Valdis.Kletnieks
2007-12-21 3:07 ` [PATCH 0/10] sysfs network namespace support Greg KH
2007-12-21 13:04 ` Eric W. Biederman
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=m17ijy7odv.fsf_-_@ebiederm.dsl.xmission.com \
--to=ebiederm@xmission.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.osdl.org \
--cc=cornelia.huck@de.ibm.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=gregkh@suse.de \
--cc=herbert@gondor.apana.org.au \
--cc=htejun@gmail.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/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).