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 09/10] driver core: Implement tagged directory support for device classes.
Date: Sat, 01 Dec 2007 02:33:11 -0700 [thread overview]
Message-ID: <m13aum7oa0.fsf_-_@ebiederm.dsl.xmission.com> (raw)
In-Reply-To: <m17ijy7odv.fsf_-_@ebiederm.dsl.xmission.com> (Eric W. Biederman's message of "Sat, 01 Dec 2007 02:30:52 -0700")
This patch enables tagging on every class directory if struct class
has tag_ops.
In addition device_del and device_rename were modified to use
sysfs_delete_link and sysfs_rename_link respectively to ensure when
these operations happen on devices whose classes have tag_ops that they
work properly.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---
drivers/base/class.c | 30 ++++++++++++++++++++++++---
drivers/base/core.c | 51 +++++++++++++++++++++++++----------------------
include/linux/device.h | 2 +
3 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index c4f8843..ed9393d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -135,6 +135,17 @@ static void remove_class_attrs(struct class * cls)
}
}
+static int class_setup_tagging(struct class *cls)
+{
+ const struct sysfs_tagged_dir_operations *tag_ops;
+
+ tag_ops = cls->tag_ops;
+ if (!tag_ops)
+ return 0;
+
+ return sysfs_enable_tagging(&cls->subsys.kobj, tag_ops);
+}
+
int class_register(struct class * cls)
{
int error;
@@ -160,11 +171,22 @@ int class_register(struct class * cls)
cls->subsys.kobj.ktype = &class_ktype;
error = kset_register(&cls->subsys);
- if (!error) {
- error = add_class_attrs(class_get(cls));
- class_put(cls);
- }
+ if (error)
+ goto out;
+
+ error = class_setup_tagging(cls);
+ if (error)
+ goto out_unregister;
+
+ error = add_class_attrs(cls);
+ if (error)
+ goto out_unregister;
+
+out:
return error;
+out_unregister:
+ kset_unregister(&cls->subsys);
+ goto out;
}
void class_unregister(struct class * cls)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index a2c3d4e..f9d3fcf 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -600,16 +600,20 @@ static struct kobject *get_device_parent(struct device *dev,
return kobj;
/* or create a new class-directory at the parent device */
- k = kobject_create(dev->class->name, parent_kobj);
- if (!k)
+bser kobj = kobject_create(dev->class->name, parent_kobj);
+ if (!kobj)
return NULL;
- k->kset = &dev->class->class_dirs;
- retval = kobject_register(k);
+ kobj->kset = &dev->class->class_dirs;
+ retval = kobject_register(kobj);
if (retval < 0) {
- kfree(k);
+ kfree(kobj);
return NULL;
}
- return k;
+ /* If we created a new class-directory setup tagging */
+ if (kobj && dev->class->tag_ops)
+ sysfs_enable_tagging(k, dev->class->tag_ops);
+
+ return kobj;
}
if (parent)
@@ -758,7 +762,8 @@ static void device_remove_class_symlinks(struct device *dev)
if (dev->kobj.parent != &dev->class->subsys.kobj &&
dev->type != &part_type)
- sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
+ sysfs_delete_link(&dev->class->subsys.kobj,
+ &dev->kobj, dev->bus_id);
#else
if (dev->parent && dev->type != &part_type)
sysfs_remove_link(&dev->kobj, "device");
@@ -1223,6 +1228,15 @@ int device_rename(struct device *dev, char *new_name)
strlcpy(old_device_name, dev->bus_id, BUS_ID_SIZE);
strlcpy(dev->bus_id, new_name, BUS_ID_SIZE);
+#ifndef CONFIG_SYSFS_DEPRECATED
+ if (dev->class && (dev->kobj.parent != &dev->class->subsys.kobj)) {
+ error = sysfs_rename_link(&dev->class->subsys.kobj,
+ &dev->kobj, old_device_name, new_name);
+ if (error)
+ goto out;
+ }
+#endif
+
error = kobject_rename(&dev->kobj, new_name);
if (error) {
strlcpy(dev->bus_id, old_device_name, BUS_ID_SIZE);
@@ -1231,24 +1245,13 @@ int device_rename(struct device *dev, char *new_name)
#ifdef CONFIG_SYSFS_DEPRECATED
if (old_class_name) {
+ error = -ENOMEM;
new_class_name = make_class_name(dev->class->name, &dev->kobj);
- if (new_class_name) {
- error = sysfs_create_link(&dev->parent->kobj,
- &dev->kobj, new_class_name);
- if (error)
- goto out;
- sysfs_remove_link(&dev->parent->kobj, old_class_name);
- }
- }
-#else
- if (dev->class) {
- sysfs_remove_link(&dev->class->subsys.kobj, old_device_name);
- error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
- dev->bus_id);
- if (error) {
- dev_err(dev, "%s: sysfs_create_symlink failed (%d)\n",
- __FUNCTION__, error);
- }
+ if (new_class_name)
+ error = sysfs_rename_link(&dev->parent->kobj,
+ &dev->kobj,
+ old_class_name,
+ new_class_name);
}
#endif
diff --git a/include/linux/device.h b/include/linux/device.h
index ed38712..80ba08f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -187,6 +187,8 @@ struct class {
int (*suspend)(struct device *, pm_message_t state);
int (*resume)(struct device *);
+
+ const struct sysfs_tagged_dir_operations *tag_ops;
};
extern int __must_check class_register(struct class *);
--
1.5.3.rc6.17.g1911
next prev parent reply other threads:[~2007-12-01 9:39 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 ` [PATCH 08/10] sysfs: Implement sysfs_delete_link and sysfs_rename_link Eric W. Biederman
2007-12-01 9:33 ` Eric W. Biederman [this message]
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=m13aum7oa0.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).