block: remove the update_bdev parameter to set_capacity_revalidate_and_notify

[linux-2.6-microblaze.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 656bcf4..679c2c0 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -630,13 +630,11 @@ static struct scsi_driver sd_template = {
 };
 
 /*
- * Dummy kobj_map->probe function.
- * The default ->probe function will call modprobe, which is
- * pointless as this module is already loaded.
+ * Don't request a new module, as that could deadlock in multipath
+ * environment.
  */
-static struct kobject *sd_default_probe(dev_t devt, int *partno, void *data)
+static void sd_default_probe(dev_t devt)
 {
-       return NULL;
 }
 
 /*
@@ -1750,10 +1748,8 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr)
 static void sd_rescan(struct device *dev)
 {
        struct scsi_disk *sdkp = dev_get_drvdata(dev);
-       int ret;
 
-       ret = sd_revalidate_disk(sdkp->disk);
-       revalidate_disk_size(sdkp->disk, ret == 0);
+       sd_revalidate_disk(sdkp->disk);
 }
 
 static int sd_ioctl(struct block_device *bdev, fmode_t mode,
@@ -3265,8 +3261,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
 
        sdkp->first_scan = 0;
 
-       set_capacity_revalidate_and_notify(disk,
-               logical_to_sectors(sdp, sdkp->capacity), false);
+       set_capacity_and_notify(disk, logical_to_sectors(sdp, sdkp->capacity));
        sd_config_write_same(sdkp);
        kfree(buffer);
 
@@ -3276,7 +3271,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         * capacity to 0.
         */
        if (sd_zbc_revalidate_zones(sdkp))
-               set_capacity_revalidate_and_notify(disk, 0, false);
+               set_capacity_and_notify(disk, 0);
 
  out:
        return 0;
@@ -3528,9 +3523,6 @@ static int sd_remove(struct device *dev)
 
        free_opal_dev(sdkp->opal_dev);
 
-       blk_register_region(devt, SD_MINORS, NULL,
-                           sd_default_probe, NULL, NULL);
-
        mutex_lock(&sd_ref_mutex);
        dev_set_drvdata(dev, NULL);
        put_device(&sdkp->dev);
@@ -3720,11 +3712,9 @@ static int __init init_sd(void)
        SCSI_LOG_HLQUEUE(3, printk("init_sd: sd driver entry point\n"));
 
        for (i = 0; i < SD_MAJORS; i++) {
-               if (register_blkdev(sd_major(i), "sd") != 0)
+               if (__register_blkdev(sd_major(i), "sd", sd_default_probe))
                        continue;
                majors++;
-               blk_register_region(sd_major(i), SD_MINORS, NULL,
-                                   sd_default_probe, NULL, NULL);
        }
 
        if (!majors)
@@ -3797,10 +3787,8 @@ static void __exit exit_sd(void)
 
        class_unregister(&sd_disk_class);
 
-       for (i = 0; i < SD_MAJORS; i++) {
-               blk_unregister_region(sd_major(i), SD_MINORS);
+       for (i = 0; i < SD_MAJORS; i++)
                unregister_blkdev(sd_major(i), "sd");
-       }
 }
 
 module_init(init_sd);