mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
osd: Convert to new IDA API
Slightly simpler code. Signed-off-by: Matthew Wilcox <willy@infradead.org>
This commit is contained in:
parent
9401508012
commit
5963e78d0c
1 changed files with 7 additions and 15 deletions
|
@ -423,19 +423,11 @@ static int osd_probe(struct device *dev)
|
||||||
if (scsi_device->type != TYPE_OSD)
|
if (scsi_device->type != TYPE_OSD)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
do {
|
minor = ida_alloc_max(&osd_minor_ida, SCSI_OSD_MAX_MINOR, GFP_KERNEL);
|
||||||
if (!ida_pre_get(&osd_minor_ida, GFP_KERNEL))
|
if (minor == -ENOSPC)
|
||||||
return -ENODEV;
|
return -EBUSY;
|
||||||
|
if (minor < 0)
|
||||||
error = ida_get_new(&osd_minor_ida, &minor);
|
return -ENODEV;
|
||||||
} while (error == -EAGAIN);
|
|
||||||
|
|
||||||
if (error)
|
|
||||||
return error;
|
|
||||||
if (minor >= SCSI_OSD_MAX_MINOR) {
|
|
||||||
error = -EBUSY;
|
|
||||||
goto err_retract_minor;
|
|
||||||
}
|
|
||||||
|
|
||||||
error = -ENOMEM;
|
error = -ENOMEM;
|
||||||
oud = kzalloc(sizeof(*oud), GFP_KERNEL);
|
oud = kzalloc(sizeof(*oud), GFP_KERNEL);
|
||||||
|
@ -499,7 +491,7 @@ static int osd_probe(struct device *dev)
|
||||||
err_free_osd:
|
err_free_osd:
|
||||||
put_device(&oud->class_dev);
|
put_device(&oud->class_dev);
|
||||||
err_retract_minor:
|
err_retract_minor:
|
||||||
ida_remove(&osd_minor_ida, minor);
|
ida_free(&osd_minor_ida, minor);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -514,7 +506,7 @@ static int osd_remove(struct device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
cdev_device_del(&oud->cdev, &oud->class_dev);
|
cdev_device_del(&oud->cdev, &oud->class_dev);
|
||||||
ida_remove(&osd_minor_ida, oud->minor);
|
ida_free(&osd_minor_ida, oud->minor);
|
||||||
put_device(&oud->class_dev);
|
put_device(&oud->class_dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue