From: <gregkh@suse•de>
To: ebiederm@xmission•com, bcrl@lhnet•ca, benjamin.thery@bull•net,
cornelia.huck@de•ibm.com, eric.dumazet@gmail•com, gregkh@suse•de,
kay.sievers@vrfy•org, netdev@vger•kernel.org, serue@us.
Subject: patch driver-core-implement-ns-directory-support-for-device-classes.patch added to gregkh-2.6 tree
Date: Thu, 29 Apr 2010 13:29:00 -0700 [thread overview]
Message-ID: <12725729403493@kroah.org> (raw)
In-Reply-To: <1269973889-25260-6-git-send-email-ebiederm@xmission.com>
This is a note to let you know that I've just added the patch titled
Subject: driver core: Implement ns directory support for device classes.
to my gregkh-2.6 tree. Its filename is
driver-core-implement-ns-directory-support-for-device-classes.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From ebiederm@xmission•com Thu Apr 29 12:47:44 2010
From: "Eric W. Biederman" <ebiederm@xmission•com>
Date: Tue, 30 Mar 2010 11:31:29 -0700
Subject: driver core: Implement ns directory support for device classes.
To: Greg Kroah-Hartman <gregkh@suse•de>
Cc: Kay Sievers <kay.sievers@vrfy•org>, linux-kernel@vger•kernel.org, Tejun Heo <tj@kernel•org>, Cornelia Huck <cornelia.huck@de•ibm.com>, linux-fsdevel@vger•kernel.org, Eric Dumazet <eric.dumazet@gmail•com>, Benjamin LaHaise <bcrl@lhnet•ca>, Serge Hallyn <serue@us•ibm.com>, <netdev@vger•kernel.org>, "Eric W. Biederman" <ebiederm@xmission•com>, Benjamin Thery <benjamin.thery@bull•net>
Message-ID: <1269973889-25260-6-git-send-email-ebiederm@xmission•com>
From: Eric W. Biederman <ebiederm@xmission•com>
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
are in namespace directories they work properly.
Signed-off-by: Eric W. Biederman <ebiederm@xmission•com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull•net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse•de>
---
drivers/base/core.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -786,7 +786,7 @@ out_device:
out_busid:
if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&
device_is_not_partition(dev))
- sysfs_remove_link(&dev->class->p->class_subsys.kobj,
+ sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,
dev_name(dev));
#else
/* link in the class directory pointing to the device */
@@ -804,7 +804,7 @@ out_busid:
return 0;
out_busid:
- sysfs_remove_link(&dev->class->p->class_subsys.kobj, dev_name(dev));
+ sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
#endif
out_subsys:
@@ -832,13 +832,13 @@ static void device_remove_class_symlinks
if (dev->kobj.parent != &dev->class->p->class_subsys.kobj &&
device_is_not_partition(dev))
- sysfs_remove_link(&dev->class->p->class_subsys.kobj,
+ sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj,
dev_name(dev));
#else
if (dev->parent && device_is_not_partition(dev))
sysfs_remove_link(&dev->kobj, "device");
- sysfs_remove_link(&dev->class->p->class_subsys.kobj, dev_name(dev));
+ sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
#endif
sysfs_remove_link(&dev->kobj, "subsystem");
@@ -1624,6 +1624,14 @@ int device_rename(struct device *dev, ch
goto out;
}
+#ifndef CONFIG_SYSFS_DEPRECATED
+ if (dev->class) {
+ error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,
+ &dev->kobj, old_device_name, new_name);
+ if (error)
+ goto out;
+ }
+#endif
error = kobject_rename(&dev->kobj, new_name);
if (error)
goto out;
@@ -1638,11 +1646,6 @@ int device_rename(struct device *dev, ch
new_class_name);
}
}
-#else
- if (dev->class) {
- error = sysfs_rename_link(&dev->class->p->class_subsys.kobj,
- &dev->kobj, old_device_name, new_name);
- }
#endif
out:
next prev parent reply other threads:[~2010-04-30 17:08 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 18:30 [PATCH 0/6] tagged sysfs support Eric W. Biederman
2010-03-30 18:31 ` [PATCH 1/6] sysfs: Basic support for multiple super blocks Eric W. Biederman
2010-03-30 19:23 ` Eric Dumazet
2010-03-30 23:50 ` [PATCH 7/6] sysfs: Remove double free sysfs_get_sb Eric W. Biederman
2010-03-31 5:01 ` [PATCH 1/6] sysfs: Basic support for multiple super blocks Serge E. Hallyn
2010-03-31 5:01 ` Serge E. Hallyn
2010-03-31 5:41 ` Tejun Heo
2010-03-31 5:51 ` Eric W. Biederman
2010-03-31 13:47 ` Serge E. Hallyn
2010-03-31 14:02 ` Eric W. Biederman
2010-04-05 7:45 ` Tejun Heo
2010-04-29 20:29 ` patch sysfs-basic-support-for-multiple-super-blocks.patch added to gregkh-2.6 tree gregkh
2010-03-30 18:31 ` [PATCH 2/6] kobj: Add basic infrastructure for dealing with namespaces Eric W. Biederman
2010-04-29 20:29 ` patch kobj-add-basic-infrastructure-for-dealing-with-namespaces.patch added to gregkh-2.6 tree gregkh
2010-03-30 18:31 ` [PATCH 3/6] sysfs: Implement sysfs tagged directory support Eric W. Biederman
2010-03-31 2:43 ` Serge E. Hallyn
2010-03-31 3:38 ` Eric W. Biederman
2010-03-31 4:02 ` Serge E. Hallyn
2010-03-31 4:23 ` Eric W. Biederman
2010-03-31 4:53 ` Serge E. Hallyn
2010-03-31 6:49 ` Tejun Heo
2010-03-31 7:43 ` Eric W. Biederman
2010-03-31 8:17 ` Tejun Heo
2010-03-31 8:22 ` Tejun Heo
2010-03-31 9:39 ` Eric W. Biederman
2010-04-05 8:17 ` Tejun Heo
2010-04-29 20:29 ` patch sysfs-implement-sysfs-tagged-directory-support.patch added to gregkh-2.6 tree gregkh
2010-04-30 4:18 ` Tejun Heo
2010-04-30 4:45 ` Greg KH
2010-04-30 5:24 ` Eric W. Biederman
2010-04-30 5:37 ` Tejun Heo
2010-04-30 6:12 ` Tejun Heo
2010-04-30 14:29 ` Serge E. Hallyn
2010-04-30 15:22 ` Tejun Heo
2010-04-30 15:43 ` Serge E. Hallyn
2010-04-30 15:58 ` Greg KH
2010-03-30 18:31 ` [PATCH 4/6] sysfs: Add support for tagged directories with untagged members Eric W. Biederman
2010-04-29 20:29 ` patch sysfs-add-support-for-tagged-directories-with-untagged-members.patch added to gregkh-2.6 tree gregkh
2010-03-30 18:31 ` [PATCH 5/6] sysfs: Implement sysfs_delete_link Eric W. Biederman
2010-04-29 20:29 ` patch sysfs-implement-sysfs_delete_link.patch added to gregkh-2.6 tree gregkh
2010-03-30 18:31 ` [PATCH 6/6] driver core: Implement ns directory support for device classes Eric W. Biederman
2010-04-29 20:29 ` gregkh [this message]
2010-03-30 18:53 ` [PATCH 0/6] tagged sysfs support Kay Sievers
2010-03-30 23:04 ` Eric W. Biederman
2010-03-31 5:51 ` Kay Sievers
2010-03-31 6:25 ` Tejun Heo
2010-03-31 6:52 ` Eric W. Biederman
2010-04-03 0:58 ` Ben Hutchings
2010-04-03 8:35 ` Kay Sievers
2010-04-03 16:05 ` Ben Hutchings
2010-04-03 16:35 ` Kay Sievers
2010-03-31 17:21 ` Serge E. Hallyn
2010-03-31 18:09 ` Eric W. Biederman
2010-05-05 0:35 ` [PATCH 0/6] netns support in the kobject layer Eric W. Biederman
2010-05-06 20:04 ` Greg KH
2010-05-16 6:26 ` David Miller
2010-05-17 18:11 ` Greg KH
2010-05-17 20:58 ` Eric W. Biederman
2010-05-17 21:03 ` Greg KH
2010-05-17 22:37 ` Eric W. Biederman
2010-05-17 22:54 ` Greg KH
2010-05-17 23:48 ` David Miller
2010-05-18 4:08 ` Greg KH
2010-05-18 4:21 ` David Miller
2010-05-05 0:36 ` [PATCH 1/6] kobject: Send hotplug events in all network namespaces Eric W. Biederman
2010-05-20 18:10 ` patch kobject-send-hotplug-events-in-all-network-namespaces.patch added to gregkh-2.6 tree gregkh
2010-05-05 0:36 ` [PATCH 2/6] netns: Teach network device kobjects which namespace they are in Eric W. Biederman
2010-05-05 15:17 ` Serge E. Hallyn
2010-05-05 19:56 ` Eric W. Biederman
2010-05-05 22:01 ` Serge E. Hallyn
2010-05-17 4:59 ` [PATCH 7/6] net/sysfs: Fix the bitrot in network device kobject namespace support Eric W. Biederman
2010-05-17 5:07 ` David Miller
2010-05-20 18:10 ` patch netns-teach-network-device-kobjects-which-namespace-they-are-in.patch added to gregkh-2.6 tree gregkh
2010-05-05 0:36 ` [PATCH 3/6] netlink: Implment netlink_broadcast_filtered Eric W. Biederman
2010-05-20 18:10 ` patch netlink-implment-netlink_broadcast_filtered.patch added to gregkh-2.6 tree gregkh
2010-05-05 0:36 ` [PATCH 4/6] kobj: Send hotplug events in the proper namespace Eric W. Biederman
2010-05-20 18:10 ` patch kobj-send-hotplug-events-in-the-proper-namespace.patch added to gregkh-2.6 tree gregkh
2010-05-05 0:36 ` [PATCH 5/6] hotplug: netns aware uevent_helper Eric W. Biederman
2010-05-20 18:10 ` patch hotplug-netns-aware-uevent_helper.patch added to gregkh-2.6 tree gregkh
2010-05-05 0:36 ` [PATCH 6/6] net: Expose all network devices in a namespaces in sysfs Eric W. Biederman
2010-05-20 18:10 ` patch net-expose-all-network-devices-in-a-namespaces-in-sysfs.patch added to gregkh-2.6 tree gregkh
2010-05-20 17:47 ` [PATCH 0/6] tagged sysfs support Greg KH
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=12725729403493@kroah.org \
--to=gregkh@suse$(echo .)de \
--cc=bcrl@lhnet$(echo .)ca \
--cc=benjamin.thery@bull$(echo .)net \
--cc=cornelia.huck@de$(echo .)ibm.com \
--cc=ebiederm@xmission$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=serue@us. \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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