* [PATCH 2/4 ver 2] SCSI: fix various bugs in the the scsi_device code
@ 2009-10-28 19:09 Alan Stern
0 siblings, 0 replies; only message in thread
From: Alan Stern @ 2009-10-28 19:09 UTC (permalink / raw)
To: James Bottomley; +Cc: SCSI development list
This patch (as1277b) fixes some bugs in the scsi_device code:
In scsi_report_lun_scan(), if a newly-allocated device
couldn't be used, it never got deleted.
scsi_get_host_dev() incorrectly called get_device() on the
new device's target. This was compensated by a put_device()
in scsi_sysfs_add_sdev(), but only in one of the error paths.
Most, but not all, of the error paths in scsi_sysfs_add_sdev()
would mistakenly remove the device. Since the caller always
removes the device if anything goes wrong,
scsi_sysfs_add_sdev() should leave it alone.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
---
Index: usb-2.6/drivers/scsi/scsi_scan.c
===================================================================
--- usb-2.6.orig/drivers/scsi/scsi_scan.c
+++ usb-2.6/drivers/scsi/scsi_scan.c
@@ -1334,8 +1334,10 @@ static int scsi_report_lun_scan(struct s
sdev = scsi_alloc_sdev(starget, 0, NULL);
if (!sdev)
return 0;
- if (scsi_device_get(sdev))
+ if (scsi_device_get(sdev)) {
+ __scsi_remove_device(sdev);
return 0;
+ }
}
sprintf(devname, "host %d channel %d id %d",
@@ -1902,10 +1904,9 @@ struct scsi_device *scsi_get_host_dev(st
goto out;
sdev = scsi_alloc_sdev(starget, 0, NULL);
- if (sdev) {
- sdev->sdev_gendev.parent = get_device(&starget->dev);
+ if (sdev)
sdev->borken = 0;
- } else
+ else
scsi_target_reap(starget);
put_device(&starget->dev);
out:
Index: usb-2.6/drivers/scsi/scsi_sysfs.c
===================================================================
--- usb-2.6.orig/drivers/scsi/scsi_sysfs.c
+++ usb-2.6/drivers/scsi/scsi_sysfs.c
@@ -859,7 +859,6 @@ int scsi_sysfs_add_sdev(struct scsi_devi
transport_configure_device(&starget->dev);
error = device_add(&sdev->sdev_gendev);
if (error) {
- put_device(sdev->sdev_gendev.parent);
printk(KERN_INFO "error 1\n");
return error;
}
@@ -868,7 +867,6 @@ int scsi_sysfs_add_sdev(struct scsi_devi
error = device_add(&sdev->sdev_dev);
if (error) {
printk(KERN_INFO "error 2\n");
- __scsi_remove_device(sdev);
return error;
}
sdev->did_add_sdev_dev = 1;
@@ -882,18 +880,14 @@ int scsi_sysfs_add_sdev(struct scsi_devi
error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_depth_rw);
else
error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth);
- if (error) {
- __scsi_remove_device(sdev);
+ if (error)
goto out;
- }
if (sdev->host->hostt->change_queue_type)
error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_type_rw);
else
error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_type);
- if (error) {
- __scsi_remove_device(sdev);
+ if (error)
goto out;
- }
error = bsg_register_queue(rq, &sdev->sdev_gendev, NULL, NULL);
@@ -911,10 +905,8 @@ int scsi_sysfs_add_sdev(struct scsi_devi
for (i = 0; sdev->host->hostt->sdev_attrs[i]; i++) {
error = device_create_file(&sdev->sdev_gendev,
sdev->host->hostt->sdev_attrs[i]);
- if (error) {
- __scsi_remove_device(sdev);
+ if (error)
goto out;
- }
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-28 19:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-28 19:09 [PATCH 2/4 ver 2] SCSI: fix various bugs in the the scsi_device code Alan Stern
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.