block: drop references taken by class_find_device()

[linux-2.6-omap-h63xx.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index c13cc77291af7d1c26378051f7fa1b9770d0f81d..656c2c7abf999628e1232024b71c4af2f22a1ac9 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -293,27 +293,30 @@ void __init printk_all_partitions(void)
 /* iterator */
 static int find_start(struct device *dev, void *data)
 {
-       loff_t k = *(loff_t *)data;
+       loff_t *k = data;
 
        if (dev->type != &disk_type)
                return 0;
-       if (!k--)
+       if (!*k)
                return 1;
+       (*k)--;
        return 0;
 }
 
 static void *part_start(struct seq_file *part, loff_t *pos)
 {
        struct device *dev;
-       loff_t n = *pos;
+       loff_t k = *pos;
 
-       if (!n)
+       if (!k)
                seq_puts(part, "major minor  #blocks  name\n\n");
 
        mutex_lock(&block_class_lock);
-       dev = class_find_device(&block_class, NULL, (void *)pos, find_start);
-       if (dev)
+       dev = class_find_device(&block_class, NULL, &k, find_start);
+       if (dev) {
+               put_device(dev);
                return dev_to_disk(dev);
+       }
        return NULL;
 }
 
@@ -330,8 +333,10 @@ static void *part_next(struct seq_file *part, void *v, loff_t *pos)
        struct device *dev;
        ++*pos;
        dev = class_find_device(&block_class, &gp->dev, NULL, find_next);
-       if (dev)
+       if (dev) {
+               put_device(dev);
                return dev_to_disk(dev);
+       }
        return NULL;
 }
 
@@ -568,11 +573,14 @@ static struct device_type disk_type = {
 static void *diskstats_start(struct seq_file *part, loff_t *pos)
 {
        struct device *dev;
+       loff_t k = *pos;
 
        mutex_lock(&block_class_lock);
-       dev = class_find_device(&block_class, NULL, (void *)pos, find_start);
-       if (dev)
+       dev = class_find_device(&block_class, NULL, &k, find_start);
+       if (dev) {
+               put_device(dev);
                return dev_to_disk(dev);
+       }
        return NULL;
 }
 
@@ -583,8 +591,10 @@ static void *diskstats_next(struct seq_file *part, void *v, loff_t *pos)
 
        ++*pos;
        dev = class_find_device(&block_class, &gp->dev, NULL, find_next);
-       if (dev)
+       if (dev) {
+               put_device(dev);
                return dev_to_disk(dev);
+       }
        return NULL;
 }
 
@@ -712,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;