diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:47:39 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:04:37 -0400 |
commit | e3df715501be3329986e5d9dfa9a477f49e7996b (patch) | |
tree | 3602c4bbca8bca9b615b93099de53717bc932591 /drivers/fc4 | |
parent | 12021fff2bae7fab01c4bf283f3cd9bc6997d8c4 (diff) |
[SCSI] Remove unnecessary locking around completion function calls
The SCSI ->done() hook should not be called from inside a spinlock.
Drivers that do this are mostly cut-n-paste from 2.2.x-era.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/fc4')
-rw-r--r-- | drivers/fc4/fc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index 1fbb219aa9ba..d9e11b536659 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c | |||
@@ -767,10 +767,8 @@ static void fcp_scsi_done (Scsi_Cmnd *SCpnt) | |||
767 | { | 767 | { |
768 | unsigned long flags; | 768 | unsigned long flags; |
769 | 769 | ||
770 | spin_lock_irqsave(SCpnt->device->host->host_lock, flags); | ||
771 | if (FCP_CMND(SCpnt)->done) | 770 | if (FCP_CMND(SCpnt)->done) |
772 | FCP_CMND(SCpnt)->done(SCpnt); | 771 | FCP_CMND(SCpnt)->done(SCpnt); |
773 | spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags); | ||
774 | } | 772 | } |
775 | 773 | ||
776 | static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, int prepare) | 774 | static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, int prepare) |
@@ -912,9 +910,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt) | |||
912 | unsigned long flags; | 910 | unsigned long flags; |
913 | 911 | ||
914 | SCpnt->result = DID_ABORT; | 912 | SCpnt->result = DID_ABORT; |
915 | spin_lock_irqsave(SCpnt->device->host->host_lock, flags); | ||
916 | fcmd->done(SCpnt); | 913 | fcmd->done(SCpnt); |
917 | spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags); | ||
918 | printk("FC: soft abort\n"); | 914 | printk("FC: soft abort\n"); |
919 | return SUCCESS; | 915 | return SUCCESS; |
920 | } else { | 916 | } else { |