From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hannes Reinecke Subject: [PATCH] Fix reference counting for failed SCSI devices Date: Tue, 24 May 2005 11:38:57 +0200 Message-ID: <4292F631.9090300@suse.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060606080201000100040007" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: James Bottomley Cc: SCSI Mailing List , Linux Kernel List-Id: linux-scsi@vger.kernel.org This is a multi-part message in MIME format. --------------060606080201000100040007 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Hi James, whenever the scsi-ml tries to scan non-existent devices the reference count in scsi_alloc_sdev() and scsi_probe_and_add_lun() is not adjusted properly. Every call to XXX_initialize in the driver core sets the reference count to 1, so for a proper deallocation an explicit XXX_put() has to be done. Please apply. Cheers, Hannes -- Dr. Hannes Reinecke hare@suse.de SuSE Linux AG S390 & zSeries Maxfeldstraße 5 +49 911 74053 688 90409 Nürnberg http://www.suse.de --------------060606080201000100040007 Content-Type: text/plain; name="linux-2.6.12-rc4-scsi-scan-fix-refcount-on-fail" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linux-2.6.12-rc4-scsi-scan-fix-refcount-on-fail" From: Hannes Reinecke Subject: Fix refcount for failed devices When a non-present device is scanned it is not properly deregistered from the driver core. Calling XXX_initialize() functions from the driver core sets the reference count to 1, so for proper deallocation a XXX_put() has to be issued. --- linux-2.6.12-rc4/drivers/scsi/scsi_scan.c.orig 2005-05-24 10:26:46.000000000 +0200 +++ linux-2.6.12-rc4/drivers/scsi/scsi_scan.c 2005-05-24 10:55:52.000000000 +0200 @@ -273,6 +273,7 @@ static struct scsi_device *scsi_alloc_sd */ if (ret == -ENXIO) display_failure_msg = 0; + put_device(&starget->dev); goto out_device_destroy; } } @@ -282,6 +283,7 @@ static struct scsi_device *scsi_alloc_sd out_device_destroy: transport_destroy_device(&sdev->sdev_gendev); scsi_free_queue(sdev->request_queue); + class_device_put(&sdev->sdev_classdev); put_device(&sdev->sdev_gendev); out: if (display_failure_msg) @@ -855,6 +857,8 @@ static int scsi_probe_and_add_lun(struct if (sdev->host->hostt->slave_destroy) sdev->host->hostt->slave_destroy(sdev); transport_destroy_device(&sdev->sdev_gendev); + class_device_put(&sdev->sdev_classdev); + put_device(sdev->sdev_gendev.parent); put_device(&sdev->sdev_gendev); } out: --------------060606080201000100040007--