diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-02-02 14:01:24 +0100 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2015-03-19 06:38:43 -0700 |
| commit | e27829dc92e549486b8248cdfa53e108abb6acfb (patch) | |
| tree | ae421000e744e0d3b766bd2a41468b6eaba052fc /drivers/scsi/scsi_scan.c | |
| parent | ncr5380: Harmonize jiffies conversion with msecs_to_jiffies (diff) | |
| download | linux-dev-e27829dc92e549486b8248cdfa53e108abb6acfb.tar.xz linux-dev-e27829dc92e549486b8248cdfa53e108abb6acfb.zip | |
scsi: serialize ->rescan against ->remove
Lock the device embedded in the scsi_device to protect against
concurrent calls to ->remove.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 9c0a520d933c..60aae01caa89 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1570,16 +1570,15 @@ EXPORT_SYMBOL(scsi_add_device); void scsi_rescan_device(struct device *dev) { - if (!dev->driver) - return; - - if (try_module_get(dev->driver->owner)) { + device_lock(dev); + if (dev->driver && try_module_get(dev->driver->owner)) { struct scsi_driver *drv = to_scsi_driver(dev->driver); if (drv->rescan) drv->rescan(dev); module_put(dev->driver->owner); } + device_unlock(dev); } EXPORT_SYMBOL(scsi_rescan_device); |