diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-04-04 09:42:41 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-05-01 10:23:54 -0500 |
| commit | aeaeb5cec5a5477b392e627883fdb46d8a5dcc1f (patch) | |
| tree | d5e7f02ff78c30bf4a67afa8227bef6ca4c1a9c9 /drivers/message | |
| parent | a7c44d4ad147d54f041ba3885cc28549da72f55a (diff) | |
| download | kernel_samsung_smdk4412-aeaeb5cec5a5477b392e627883fdb46d8a5dcc1f.zip kernel_samsung_smdk4412-aeaeb5cec5a5477b392e627883fdb46d8a5dcc1f.tar.gz kernel_samsung_smdk4412-aeaeb5cec5a5477b392e627883fdb46d8a5dcc1f.tar.bz2 | |
[SCSI] fusion: do not check serial_number in the abort handler
The SCSI midlayer stops all command processing when in error handling, which
means there is no chance for command reuse when the abort handler is called.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 0d9b82a..b871ab3 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c @@ -1773,7 +1773,6 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) int scpnt_idx; int retval; VirtDevice *vdevice; - ulong sn = SCpnt->serial_number; MPT_ADAPTER *ioc; /* If we can't locate our host adapter structure, return FAILED status. @@ -1859,8 +1858,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) vdevice->vtarget->id, vdevice->lun, ctx2abort, mptscsih_get_tm_timeout(ioc)); - if (SCPNT_TO_LOOKUP_IDX(ioc, SCpnt) == scpnt_idx && - SCpnt->serial_number == sn) { + if (SCPNT_TO_LOOKUP_IDX(ioc, SCpnt) == scpnt_idx) { dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "task abort: command still in active list! (sc=%p)\n", ioc->name, SCpnt)); @@ -1873,9 +1871,9 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) } out: - printk(MYIOC_s_INFO_FMT "task abort: %s (rv=%04x) (sc=%p) (sn=%ld)\n", + printk(MYIOC_s_INFO_FMT "task abort: %s (rv=%04x) (sc=%p)\n", ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), retval, - SCpnt, SCpnt->serial_number); + SCpnt); return retval; } |