[SCSI] sd: remove arbitrary SD_MAX_DISKS namespace limit

There is no reason to limit the SCSI disk namespace to sdXXX.

Add new error messages to sd_probe() in the unlikely event that either
ida_get_new() or sd_format_disk_name() fail.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 5 insertions, 13 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a7942e5c8be8..fa3a5918009c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2590,18 +2590,16 @@ static int sd_probe(struct device *dev)
                 spin_unlock(&sd_index_lock);
         } while (error == -EAGAIN);
 
-        if (error)
+        if (error) {
+                sdev_printk(KERN_WARNING, sdp, "sd_probe: memory exhausted.\n");
                 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);
-        if (error)
+        if (error) {
+                sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name length exceeded.\n");
                 goto out_free_index;
+        }
 
         sdkp->device = sdp;
         sdkp->driver = &sd_template;
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 6ad798bfd52a..4163f2910e3d 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -9,12 +9,6 @@
 #define SD_MAJORS       16
 
 /*
- * This is limited by the naming scheme enforced in sd_probe,
- * add another character to it if you really need more disks.
- */
-#define SD_MAX_DISKS    (((26 * 26) + 26 + 1) * 26)
-
-/*
  * Time out in seconds for disks and Magneto-opticals (which are slower).
  */
 #define SD_TIMEOUT              (30 * HZ)