Message from discussion
Symlink /sys/class/block to /sys/block
Path: g2news1.google.com!news3.google.com!news.glorb.com!news.banetele.no!uio.no!nntp.uio.no!ifi.uio.no!internet-mailinglist
Newsgroups: fa.linux.kernel
Return-Path: <linux-kernel-owner+linux-kernel=40ifi.uio.no-S262265AbVBS...@vger.kernel.org>
From: Malcolm Rowe <malcolm-li...@farside.org.uk>
To: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux-ker...@vger.kernel.org
Subject: [PATCH] Symlink /sys/class/block to /sys/block
Original-Date: Sat, 19 Feb 2005 23:29:13 +0000
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
Original-Message-ID: <courier.4217CBC9.000027C1@mail.farside.org.uk>
Sender: linux-kernel-ow...@vger.kernel.org
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
X-MailScanner-Information: This message has been scanned for viruses/spam. Contact postmas...@uio.no if you have questions about this scanning
X-UiO-MailScanner: No virus found
X-UiO-Spam-info: not spam, SpamAssassin (score=0, required 12,
autolearn=disabled)
Organization: Internet mailing list
Date: Sat, 19 Feb 2005 23:30:53 GMT
Message-ID: <fa.lb0v71m.1qm63ak@ifi.uio.no>
Lines: 85
Greg,
Following the discussion in [1], the attached patch creates /sys/class/block
as a symlink to /sys/block. The patch applies to 2.6.11-rc4-bk7.
Please cc: me on any replies - I'm not subscribed to the mailing list.
[1] http://marc.theaimsgroup.com/?m=110506536315986
Regards,
Malcolm
Signed-off-by: Malcolm Rowe <malcolm-li...@farside.org.uk>
diff -ur linux-2.6.11-rc4-bk7/drivers/base/class.c
linux-2.6.11-rc4-bk7-diff/drivers/base/class.c
--- linux-2.6.11-rc4-bk7/drivers/base/class.c 2005-02-19 21:34:31.000000000
+0000
+++ linux-2.6.11-rc4-bk7-diff/drivers/base/class.c 2005-02-19
21:38:31.000000000 +0000
@@ -69,7 +69,7 @@
};
/* Hotplug events for classes go to the class_obj subsys */
-static decl_subsys(class, &ktype_class, NULL);
+decl_subsys(class, &ktype_class, NULL);
int class_create_file(struct class * cls, const struct class_attribute *
attr)
diff -ur linux-2.6.11-rc4-bk7/drivers/block/genhd.c
linux-2.6.11-rc4-bk7-diff/drivers/block/genhd.c
--- linux-2.6.11-rc4-bk7/drivers/block/genhd.c 2005-02-19 21:34:31.000000000
+0000
+++ linux-2.6.11-rc4-bk7-diff/drivers/block/genhd.c 2005-02-19
22:01:56.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/kmod.h>
#include <linux/kobj_map.h>
+#include <linux/sysfs.h>
#define MAX_PROBE_HASH 255 /* random */
@@ -300,11 +301,24 @@
return NULL;
}
+extern struct subsystem class_subsys;
+
static int __init genhd_device_init(void)
{
bdev_map = kobj_map_init(base_probe, &block_subsys);
blk_dev_init();
- subsystem_register(&block_subsys);
+ if (!subsystem_register(&block_subsys)) {
+ /*
+ * /sys/block should really live under /sys/class, but for
+ * the moment, we can only have class devices, not
+ * sub-classes-devices. Until we can move /sys/block into
+ * the right place, create a symlink from /sys/class/block to
+ * /sys/block, so that userspace doesn't need to know about
+ * the difference.
+ */
+ sysfs_create_link(&class_subsys.kset.kobj,
+ &block_subsys.kset.kobj, "block");
+ }
return 0;
}
@@ -406,6 +420,7 @@
static void disk_release(struct kobject * kobj)
{
struct gendisk *disk = to_disk(kobj);
+ sysfs_remove_link(&class_subsys.kset.kobj, "block");
kfree(disk->random);
kfree(disk->part);
free_disk_stats(disk);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
|
