loop: do not call set_blocksize

[linux-2.6-microblaze.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index a58084c..b42c728 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -251,12 +251,8 @@ loop_validate_block_size(unsigned short bsize)
  */
 static void loop_set_size(struct loop_device *lo, loff_t size)
 {
-       struct block_device *bdev = lo->lo_device;
-
-       bd_set_nr_sectors(bdev, size);
-
-       if (!set_capacity_revalidate_and_notify(lo->lo_disk, size, false))
-               kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);
+       if (!set_capacity_and_notify(lo->lo_disk, size))
+               kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE);
 }
 
 static inline int
@@ -1138,7 +1134,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        if (error)
                goto out_unlock;
 
-       set_device_ro(bdev, (lo->lo_flags & LO_FLAGS_READ_ONLY) != 0);
+       set_disk_ro(lo->lo_disk, (lo->lo_flags & LO_FLAGS_READ_ONLY) != 0);
 
        lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
        lo->lo_device = bdev;
@@ -1168,9 +1164,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        size = get_loop_size(lo, file);
        loop_set_size(lo, size);
 
-       set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
-                     block_size(inode->i_bdev) : PAGE_SIZE);
-
        lo->lo_state = Lo_bound;
        if (part_shift)
                lo->lo_flags |= LO_FLAGS_PARTSCAN;
@@ -2235,24 +2228,18 @@ out:
        return ret;
 }
 
-static struct kobject *loop_probe(dev_t dev, int *part, void *data)
+static void loop_probe(dev_t dev)
 {
+       int idx = MINOR(dev) >> part_shift;
        struct loop_device *lo;
-       struct kobject *kobj;
-       int err;
+
+       if (max_loop && idx >= max_loop)
+               return;
 
        mutex_lock(&loop_ctl_mutex);
-       err = loop_lookup(&lo, MINOR(dev) >> part_shift);
-       if (err < 0)
-               err = loop_add(&lo, MINOR(dev) >> part_shift);
-       if (err < 0)
-               kobj = NULL;
-       else
-               kobj = get_disk_and_module(lo->lo_disk);
+       if (loop_lookup(&lo, idx) < 0)
+               loop_add(&lo, idx);
        mutex_unlock(&loop_ctl_mutex);
-
-       *part = 0;
-       return kobj;
 }
 
 static long loop_control_ioctl(struct file *file, unsigned int cmd,
@@ -2372,14 +2359,11 @@ static int __init loop_init(void)
                goto err_out;
 
 
-       if (register_blkdev(LOOP_MAJOR, "loop")) {
+       if (__register_blkdev(LOOP_MAJOR, "loop", loop_probe)) {
                err = -EIO;
                goto misc_out;
        }
 
-       blk_register_region(MKDEV(LOOP_MAJOR, 0), range,
-                                 THIS_MODULE, loop_probe, NULL, NULL);
-
        /* pre-create number of devices given by config or max_loop */
        mutex_lock(&loop_ctl_mutex);
        for (i = 0; i < nr; i++)
@@ -2405,16 +2389,11 @@ static int loop_exit_cb(int id, void *ptr, void *data)
 
 static void __exit loop_exit(void)
 {
-       unsigned long range;
-
-       range = max_loop ? max_loop << part_shift : 1UL << MINORBITS;
-
        mutex_lock(&loop_ctl_mutex);
 
        idr_for_each(&loop_index_idr, &loop_exit_cb, NULL);
        idr_destroy(&loop_index_idr);
 
-       blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range);
        unregister_blkdev(LOOP_MAJOR, "loop");
 
        misc_deregister(&loop_misc);