From 263b1962c54a9e83dd2fc63c2457235cc2caac02 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Thu, 25 Aug 2011 09:46:32 +1000 Subject: [PATCH] Some mangling of errors was necessary to maintain current interface. Signed-off-by: Jonathan Cameron Cc: Rusty Russell Cc: Tejun Heo Cc: Guenter Roeck Cc: James Bottomley Signed-off-by: Andrew Morton --- drivers/scsi/sd.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a7942e5c8be8..4e9a42642d09 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -111,7 +111,6 @@ static void scsi_disk_release(struct device *cdev); static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *); static void sd_print_result(struct scsi_disk *, int); -static DEFINE_SPINLOCK(sd_index_lock); static DEFINE_IDA(sd_index_ida); /* This semaphore is used to mediate the 0->1 reference get in the @@ -2581,22 +2580,15 @@ static int sd_probe(struct device *dev) if (!gd) goto out_free; - do { - if (!ida_pre_get(&sd_index_ida, GFP_KERNEL)) - goto out_put; - - spin_lock(&sd_index_lock); - error = ida_get_new(&sd_index_ida, &index); - spin_unlock(&sd_index_lock); - } while (error == -EAGAIN); - - if (error) + index = ida_simple_get(&sd_index_ida, 0, SD_MAX_DISKS, GFP_KERNEL); + if (index < 0) { + error = index; + if (error == -ENOSPC) { + sdev_printk(KERN_WARNING, sdp, + "SCSI disk (sd) name space exhausted.\n"); + error = -ENODEV; + } goto out_put; - - if (index >= SD_MAX_DISKS) { - error = -ENODEV; - sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name space exhausted.\n"); - goto out_free_index; } error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN); @@ -2634,9 +2626,7 @@ static int sd_probe(struct device *dev) return 0; out_free_index: - spin_lock(&sd_index_lock); - ida_remove(&sd_index_ida, index); - spin_unlock(&sd_index_lock); + ida_simple_remove(&sd_index_ida, index); out_put: put_disk(gd); out_free: @@ -2692,9 +2682,7 @@ static void scsi_disk_release(struct device *dev) struct scsi_disk *sdkp = to_scsi_disk(dev); struct gendisk *disk = sdkp->disk; - spin_lock(&sd_index_lock); - ida_remove(&sd_index_ida, sdkp->index); - spin_unlock(&sd_index_lock); + ida_simple_remove(&sd_index_ida, sdkp->index); disk->private_data = NULL; put_disk(disk); -- 2.39.5