From 75185f99d82b812b9c09b56bf3d5eba574c93dfd Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 12 Jun 2006 22:51:14 +0900 Subject: [PATCH] --- yaml --- r: 29520 b: refs/heads/master c: d01712698c7c52bc71f41192e864dccc90a1217d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-scsi.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5f2f8e9f843c..d50af94b7db9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4c85325a817d3351e61c4be64b437116e8483b4 +refs/heads/master: d01712698c7c52bc71f41192e864dccc90a1217d diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c index 45a49be65042..32c1df69091b 100644 --- a/trunk/drivers/scsi/libata-scsi.c +++ b/trunk/drivers/scsi/libata-scsi.c @@ -3005,14 +3005,16 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel, } /** - * ata_scsi_dev_rescan - initiate scsi_rescan_device() - * @data: Pointer to ATA port to perform scsi_rescan_device() + * ata_scsi_dev_rescan - initiate scsi_rescan_device() + * @data: Pointer to ATA port to perform scsi_rescan_device() * - * After ATA pass thru (SAT) commands are executed successfully, - * libata need to propagate the changes to SCSI layer. + * After ATA pass thru (SAT) commands are executed successfully, + * libata need to propagate the changes to SCSI layer. This + * function must be executed from ata_aux_wq such that sdev + * attach/detach don't race with rescan. * - * LOCKING: - * Kernel thread context (may sleep). + * LOCKING: + * Kernel thread context (may sleep). */ void ata_scsi_dev_rescan(void *data) { @@ -3023,8 +3025,7 @@ void ata_scsi_dev_rescan(void *data) for (i = 0; i < ATA_MAX_DEVICES; i++) { dev = &ap->device[i]; - if (ata_dev_enabled(dev)) + if (ata_dev_enabled(dev) && dev->sdev) scsi_rescan_device(&(dev->sdev->sdev_gendev)); } } -