scsi/osd: use ida_simple_get()

Lai Jiangshan · Lai Jiangshan · commit d06587f658ea · 2014-04-20T14:42:59.000+08:00
Signed-off-by: Lai Jiangshan &lt;laijs@cn.fujitsu.com&gt;
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
@@ -410,7 +410,7 @@ static void __remove(struct device *dev)
 
 	if (oud->disk)
 		put_disk(oud->disk);
-	ida_remove(&osd_minor_ida, oud->minor);
+	ida_simple_remove(&osd_minor_ida, oud->minor);
 
 	kfree(oud);
 }
@@ -426,19 +426,12 @@ static int osd_probe(struct device *dev)
 	if (scsi_device->type != TYPE_OSD)
 		return -ENODEV;
 
-	do {
-		if (!ida_pre_get(&osd_minor_ida, GFP_KERNEL))
-			return -ENODEV;
-
-		error = ida_get_new(&osd_minor_ida, &minor);
-	} while (error == -EAGAIN);
-
-	if (error)
-		return error;
-	if (minor >= SCSI_OSD_MAX_MINOR) {
-		error = -EBUSY;
-		goto err_retract_minor;
-	}
+	minor = ida_simple_get(&osd_minor_ida, 0, SCSI_OSD_MAX_MINOR,
+			       GFP_KERNEL);
+	if (minor == -ENOSPC)
+		return -EBUSY;
+	else if (minor < 0)
+		return minor;
 
 	error = -ENOMEM;
 	oud = kzalloc(sizeof(*oud), GFP_KERNEL);
@@ -514,7 +507,7 @@ static int osd_probe(struct device *dev)
 	dev_set_drvdata(dev, NULL);
 	kfree(oud);
 err_retract_minor:
-	ida_remove(&osd_minor_ida, minor);
+	ida_simple_remove(&osd_minor_ida, minor);
 	return error;
 }
 
