Driver core: convert block from raw kobjects to core devices

This moves the block devices to /sys/class/block. It will create a
flat list of all block devices, with the disks and partitions in one
directory. For compatibility /sys/block is created and contains symlinks
to the disks.

  /sys/class/block
  |-- sda -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda
  |-- sda1 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1
  |-- sda10 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10
  |-- sda5 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5
  |-- sda6 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6
  |-- sda7 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7
  |-- sda8 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8
  |-- sda9 -> ../../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9
  `-- sr0 -> ../../devices/pci0000:00/0000:00:1f.2/host1/target1:0:0/1:0:0:0/block/sr0

  /sys/block/
  |-- sda -> ../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda
  `-- sr0 -> ../devices/pci0000:00/0000:00:1f.2/host1/target1:0:0/1:0:0:0/block/sr0

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

7 files changed, 60 insertions, 47 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index ba6745b0fd2f..624b3316e938 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -17,6 +17,7 @@
 #include <linux/kdev_t.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/genhd.h>
 #include "base.h"
 
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
@@ -149,7 +150,13 @@ int class_register(struct class * cls)
         if (error)
                 return error;
 
+#ifdef CONFIG_SYSFS_DEPRECATED
+        /* let the block class directory show up in the root of sysfs */
+        if (cls != &block_class)
+                cls->subsys.kobj.kset = class_kset;
+#else
         cls->subsys.kobj.kset = class_kset;
+#endif
         cls->subsys.kobj.ktype = &class_ktype;
 
         error = kset_register(&cls->subsys);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 13cae18936c5..06e8738ab263 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -671,14 +671,15 @@ static int device_add_class_symlinks(struct device *dev)
 
 #ifdef CONFIG_SYSFS_DEPRECATED
         /* stacked class devices need a symlink in the class directory */
-        if (dev->kobj.parent != &dev->class->subsys.kobj) {
+        if (dev->kobj.parent != &dev->class->subsys.kobj &&
+            dev->type != &part_type) {
                 error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
                                           dev->bus_id);
                 if (error)
                         goto out_subsys;
         }
 
-        if (dev->parent) {
+        if (dev->parent && dev->type != &part_type) {
                 struct device *parent = dev->parent;
                 char *class_name;
 
@@ -707,10 +708,11 @@ static int device_add_class_symlinks(struct device *dev)
         return 0;
 
 out_device:
-        if (dev->parent)
+        if (dev->parent && dev->type != &part_type)
                 sysfs_remove_link(&dev->kobj, "device");
 out_busid:
-        if (dev->kobj.parent != &dev->class->subsys.kobj)
+        if (dev->kobj.parent != &dev->class->subsys.kobj &&
+            dev->type != &part_type)
                 sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
 #else
         /* link in the class directory pointing to the device */
@@ -719,7 +721,7 @@ out_busid:
         if (error)
                 goto out_subsys;
 
-        if (dev->parent) {
+        if (dev->parent && dev->type != &part_type) {
                 error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
                                           "device");
                 if (error)
@@ -743,7 +745,7 @@ static void device_remove_class_symlinks(struct device *dev)
                 return;
 
 #ifdef CONFIG_SYSFS_DEPRECATED
-        if (dev->parent) {
+        if (dev->parent && dev->type != &part_type) {
                 char *class_name;
 
                 class_name = make_class_name(dev->class->name, &dev->kobj);
@@ -754,10 +756,11 @@ static void device_remove_class_symlinks(struct device *dev)
                 sysfs_remove_link(&dev->kobj, "device");
         }
 
-        if (dev->kobj.parent != &dev->class->subsys.kobj)
+        if (dev->kobj.parent != &dev->class->subsys.kobj &&
+            dev->type != &part_type)
                 sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
 #else
-        if (dev->parent)
+        if (dev->parent && dev->type != &part_type)
                 sysfs_remove_link(&dev->kobj, "device");
 
         sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
@@ -925,6 +928,7 @@ struct device * get_device(struct device * dev)
  */
 void put_device(struct device * dev)
 {
+        /* might_sleep(); */
         if (dev)
                 kobject_put(&dev->kobj);
 }
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index ad00b3d94711..826d12381e21 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -15,8 +15,10 @@
 
 static struct kmem_cache *buf_pool_cache;
 
-static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
+static ssize_t aoedisk_show_state(struct device *dev,
+                                  struct device_attribute *attr, char *page)
 {
+        struct gendisk *disk = dev_to_disk(dev);
         struct aoedev *d = disk->private_data;
 
         return snprintf(page, PAGE_SIZE,
@@ -26,50 +28,47 @@ static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
                         (d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
         /* I'd rather see nopen exported so we can ditch closewait */
 }
-static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
+static ssize_t aoedisk_show_mac(struct device *dev,
+                                struct device_attribute *attr, char *page)
 {
+        struct gendisk *disk = dev_to_disk(dev);
         struct aoedev *d = disk->private_data;
 
         return snprintf(page, PAGE_SIZE, "%012llx\n",
                         (unsigned long long)mac_addr(d->addr));
 }
-static ssize_t aoedisk_show_netif(struct gendisk * disk, char *page)
+static ssize_t aoedisk_show_netif(struct device *dev,
+                                  struct device_attribute *attr, char *page)
 {
+        struct gendisk *disk = dev_to_disk(dev);
         struct aoedev *d = disk->private_data;
 
         return snprintf(page, PAGE_SIZE, "%s\n", d->ifp->name);
 }
 /* firmware version */
-static ssize_t aoedisk_show_fwver(struct gendisk * disk, char *page)
+static ssize_t aoedisk_show_fwver(struct device *dev,
+                                  struct device_attribute *attr, char *page)
 {
+        struct gendisk *disk = dev_to_disk(dev);
         struct aoedev *d = disk->private_data;
 
         return snprintf(page, PAGE_SIZE, "0x%04x\n", (unsigned int) d->fw_ver);
 }
 
-static struct disk_attribute disk_attr_state = {
-        .attr = {.name = "state", .mode = S_IRUGO },
-        .show = aoedisk_show_state
-};
-static struct disk_attribute disk_attr_mac = {
-        .attr = {.name = "mac", .mode = S_IRUGO },
-        .show = aoedisk_show_mac
-};
-static struct disk_attribute disk_attr_netif = {
-        .attr = {.name = "netif", .mode = S_IRUGO },
-        .show = aoedisk_show_netif
-};
-static struct disk_attribute disk_attr_fwver = {
-        .attr = {.name = "firmware-version", .mode = S_IRUGO },
-        .show = aoedisk_show_fwver
+static DEVICE_ATTR(state, S_IRUGO, aoedisk_show_state, NULL);
+static DEVICE_ATTR(mac, S_IRUGO, aoedisk_show_mac, NULL);
+static DEVICE_ATTR(netif, S_IRUGO, aoedisk_show_netif, NULL);
+static struct device_attribute dev_attr_firmware_version = {
+        .attr = { .name = "firmware-version", .mode = S_IRUGO, .owner = THIS_MODULE },
+        .show = aoedisk_show_fwver,
 };
 
 static struct attribute *aoe_attrs[] = {
-        &disk_attr_state.attr,
-        &disk_attr_mac.attr,
-        &disk_attr_netif.attr,
-        &disk_attr_fwver.attr,
-        NULL
+        &dev_attr_state.attr,
+        &dev_attr_mac.attr,
+        &dev_attr_netif.attr,
+        &dev_attr_firmware_version.attr,
+        NULL,
 };
 
 static const struct attribute_group attr_group = {
@@ -79,12 +78,12 @@ static const struct attribute_group attr_group = {
 static int
 aoedisk_add_sysfs(struct aoedev *d)
 {
-        return sysfs_create_group(&d->gd->kobj, &attr_group);
+        return sysfs_create_group(&d->gd->dev.kobj, &attr_group);
 }
 void
 aoedisk_rm_sysfs(struct aoedev *d)
 {
-        sysfs_remove_group(&d->gd->kobj, &attr_group);
+        sysfs_remove_group(&d->gd->dev.kobj, &attr_group);
 }
 
 static int
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b4c0888aedc3..ba9b17e507e0 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -375,14 +375,17 @@ harderror:
         return NULL;
 }
 
-static ssize_t pid_show(struct gendisk *disk, char *page)
+static ssize_t pid_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
-        return sprintf(page, "%ld\n",
+        struct gendisk *disk = dev_to_disk(dev);
+
+        return sprintf(buf, "%ld\n",
                 (long) ((struct nbd_device *)disk->private_data)->pid);
 }
 
-static struct disk_attribute pid_attr = {
-        .attr = { .name = "pid", .mode = S_IRUGO },
+static struct device_attribute pid_attr = {
+        .attr = { .name = "pid", .mode = S_IRUGO, .owner = THIS_MODULE },
         .show = pid_show,
 };
 
@@ -394,7 +397,7 @@ static int nbd_do_it(struct nbd_device *lo)
         BUG_ON(lo->magic != LO_MAGIC);
 
         lo->pid = current->pid;
-        ret = sysfs_create_file(&lo->disk->kobj, &pid_attr.attr);
+        ret = sysfs_create_file(&lo->disk->dev.kobj, &pid_attr.attr);
         if (ret) {
                 printk(KERN_ERR "nbd: sysfs_create_file failed!");
                 return ret;
@@ -403,7 +406,7 @@ static int nbd_do_it(struct nbd_device *lo)
         while ((req = nbd_read_stat(lo)) != NULL)
                 nbd_end_request(req);
 
-        sysfs_remove_file(&lo->disk->kobj, &pid_attr.attr);
+        sysfs_remove_file(&lo->disk->dev.kobj, &pid_attr.attr);
         return 0;
 }
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 2994523be7bf..0cb3d2bb3ab9 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1173,7 +1173,7 @@ static struct kobject *exact_match(dev_t dev, int *part, void *data)
 {
         struct gendisk *p = data;
         *part &= (1 << PARTN_BITS) - 1;
-        return &p->kobj;
+        return &p->dev.kobj;
 }
 
 static int exact_lock(dev_t dev, void *data)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 88c0fd657825..f2d24eb3208c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1109,7 +1109,7 @@ static void event_callback(void *context)
         list_splice_init(&md->uevent_list, &uevents);
         spin_unlock_irqrestore(&md->uevent_lock, flags);
 
-        dm_send_uevents(&uevents, &md->disk->kobj);
+        dm_send_uevents(&uevents, &md->disk->dev.kobj);
 
         atomic_inc(&md->event_nr);
         wake_up(&md->eventq);
@@ -1530,7 +1530,7 @@ out:
  *---------------------------------------------------------------*/
 void dm_kobject_uevent(struct mapped_device *md)
 {
-        kobject_uevent(&md->disk->kobj, KOBJ_CHANGE);
+        kobject_uevent(&md->disk->dev.kobj, KOBJ_CHANGE);
 }
 
 uint32_t dm_next_uevent_seq(struct mapped_device *md)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c5030863d004..f79efb359215 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1396,9 +1396,9 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 goto fail;
 
         if (rdev->bdev->bd_part)
-                ko = &rdev->bdev->bd_part->kobj;
+                ko = &rdev->bdev->bd_part->dev.kobj;
         else
-                ko = &rdev->bdev->bd_disk->kobj;
+                ko = &rdev->bdev->bd_disk->dev.kobj;
         if ((err = sysfs_create_link(&rdev->kobj, ko, "block"))) {
                 kobject_del(&rdev->kobj);
                 goto fail;
@@ -3083,7 +3083,7 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         add_disk(disk);
         mddev->gendisk = disk;
         mutex_unlock(&disks_mutex);
-        error = kobject_init_and_add(&mddev->kobj, &md_ktype, &disk->kobj,
+        error = kobject_init_and_add(&mddev->kobj, &md_ktype, &disk->dev.kobj,
                                      "%s", "md");
         if (error)
                 printk(KERN_WARNING "md: cannot register %s/md - name in use\n",
@@ -3361,7 +3361,7 @@ static int do_md_run(mddev_t * mddev)
 
         mddev->changed = 1;
         md_new_event(mddev);
-        kobject_uevent(&mddev->gendisk->kobj, KOBJ_CHANGE);
+        kobject_uevent(&mddev->gendisk->dev.kobj, KOBJ_CHANGE);
         return 0;
 }