diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2015-01-28 03:46:53 -0600 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-02-02 13:45:28 +0100 |
| commit | 28072ad50ca7328bd99f9dba94ac27c723da0053 (patch) | |
| tree | a5ded873ab647a164ab297bd614ad18cfd79cdca /drivers/scsi/device_handler | |
| parent | bcbde52b14b70c6b3d500e8d18c261d7b1c6fed3 (diff) | |
| download | linux-28072ad50ca7328bd99f9dba94ac27c723da0053.tar.bz2 | |
scsi: fix device handler detach oops
This fixes a regression caused by commit 1d5203 ("scsi: handle more device
handler setup/teardown in common code").
The bug is that the alua detach() callout will try to access the
sddev->scsi_dh_data, but we have already set it to NULL. This patch
moves the clearing of that field to after detach() is called.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/device_handler')
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c index 1dba62c5cf6a..1efebc9eedfb 100644 --- a/drivers/scsi/device_handler/scsi_dh.c +++ b/drivers/scsi/device_handler/scsi_dh.c @@ -136,11 +136,12 @@ static void __detach_handler (struct kref *kref) struct scsi_device_handler *scsi_dh = scsi_dh_data->scsi_dh; struct scsi_device *sdev = scsi_dh_data->sdev; + scsi_dh->detach(sdev); + spin_lock_irq(sdev->request_queue->queue_lock); sdev->scsi_dh_data = NULL; spin_unlock_irq(sdev->request_queue->queue_lock); - scsi_dh->detach(sdev); sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", scsi_dh->name); module_put(scsi_dh->module); } |