Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 68a5f28..656c2c7 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -291,31 +291,51 @@ void __init printk_all_partitions(void)
 
 #ifdef CONFIG_PROC_FS
 /* iterator */
+static int find_start(struct device *dev, void *data)
+{
+       loff_t *k = data;
+
+       if (dev->type != &disk_type)
+               return 0;
+       if (!*k)
+               return 1;
+       (*k)--;
+       return 0;
+}
+
 static void *part_start(struct seq_file *part, loff_t *pos)
 {
-       loff_t k = *pos;
        struct device *dev;
+       loff_t k = *pos;
+
+       if (!k)
+               seq_puts(part, "major minor  #blocks  name\n\n");
 
        mutex_lock(&block_class_lock);
-       list_for_each_entry(dev, &block_class.devices, node) {
-               if (dev->type != &disk_type)
-                       continue;
-               if (!k--)
-                       return dev_to_disk(dev);
+       dev = class_find_device(&block_class, NULL, &k, find_start);
+       if (dev) {
+               put_device(dev);
+               return dev_to_disk(dev);
        }
        return NULL;
 }
 
+static int find_next(struct device *dev, void *data)
+{
+       if (dev->type == &disk_type)
+               return 1;
+       return 0;
+}
+
 static void *part_next(struct seq_file *part, void *v, loff_t *pos)
 {
        struct gendisk *gp = v;
        struct device *dev;
        ++*pos;
-       list_for_each_entry(dev, &gp->dev.node, node) {
-               if (&dev->node == &block_class.devices)
-                       return NULL;
-               if (dev->type == &disk_type)
-                       return dev_to_disk(dev);
+       dev = class_find_device(&block_class, &gp->dev, NULL, find_next);
+       if (dev) {
+               put_device(dev);
+               return dev_to_disk(dev);
        }
        return NULL;
 }
@@ -331,9 +351,6 @@ static int show_partition(struct seq_file *part, void *v)
        int n;
        char buf[BDEVNAME_SIZE];
 
-       if (&sgp->dev.node == block_class.devices.next)
-               seq_puts(part, "major minor  #blocks  name\n\n");
-
        /* Don't show non-partitionable removeable devices or empty devices */
        if (!get_capacity(sgp) ||
                        (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE)))
@@ -555,15 +572,14 @@ static struct device_type disk_type = {
 
 static void *diskstats_start(struct seq_file *part, loff_t *pos)
 {
-       loff_t k = *pos;
        struct device *dev;
+       loff_t k = *pos;
 
        mutex_lock(&block_class_lock);
-       list_for_each_entry(dev, &block_class.devices, node) {
-               if (dev->type != &disk_type)
-                       continue;
-               if (!k--)
-                       return dev_to_disk(dev);
+       dev = class_find_device(&block_class, NULL, &k, find_start);
+       if (dev) {
+               put_device(dev);
+               return dev_to_disk(dev);
        }
        return NULL;
 }
@@ -574,11 +590,10 @@ static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos)
        struct device *dev;
 
        ++*pos;
-       list_for_each_entry(dev, &gp->dev.node, node) {
-               if (&dev->node == &block_class.devices)
-                       return NULL;
-               if (dev->type == &disk_type)
-                       return dev_to_disk(dev);
+       dev = class_find_device(&block_class, &gp->dev, NULL, find_next);
+       if (dev) {
+               put_device(dev);
+               return dev_to_disk(dev);
        }
        return NULL;
 }
@@ -707,10 +722,12 @@ dev_t blk_lookup_devt(const char *name, int part)
        mutex_lock(&block_class_lock);
        find.name = name;
        find.part = part;
-       dev = class_find_device(&block_class, NULL, (void *)&find, match_id);
-       if (dev)
+       dev = class_find_device(&block_class, NULL, &find, match_id);
+       if (dev) {
+               put_device(dev);
                devt = MKDEV(MAJOR(dev->devt),
                             MINOR(dev->devt) + part);
+       }
        mutex_unlock(&block_class_lock);
 
        return devt;