lkml.org 
[lkml]   [2008]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 08/49] SCSI: scsi_transport_spi: fix oops in revalidate
    2.6.25-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: James Bottomley <James.Bottomley@HansenPartnership.com>

    commit e8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0 upstream

    The class_device->device conversion is causing an oops in revalidate
    because it's assuming that the device_for_each_child iterator will only
    return struct scsi_device children. The conversion made all former
    class_devices children of the device as well, so this assumption is
    broken. Fix it.

    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/scsi/scsi_transport_spi.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/scsi/scsi_transport_spi.c
    +++ b/drivers/scsi/scsi_transport_spi.c
    @@ -360,12 +360,14 @@ spi_transport_rd_attr(rti, "%d\n");
    spi_transport_rd_attr(pcomp_en, "%d\n");
    spi_transport_rd_attr(hold_mcs, "%d\n");

    -/* we only care about the first child device so we return 1 */
    +/* we only care about the first child device that's a real SCSI device
    + * so we return 1 to terminate the iteration when we find it */
    static int child_iter(struct device *dev, void *data)
    {
    - struct scsi_device *sdev = to_scsi_device(dev);
    + if (!scsi_is_sdev_device(dev))
    + return 0;

    - spi_dv_device(sdev);
    + spi_dv_device(to_scsi_device(dev));
    return 1;
    }

    --


    \
     
     \ /
      Last update: 2008-08-18 21:31    [W:3.696 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site