[PATCH] scsi: remove meaningless scsi_cmnd->serial_number_at_timeout field

scsi_cmnd->serial_number_at_timeout doesn't serve any purpose
anymore.  All serial_number == serial_number_at_timeout tests
are always true in abort callbacks.  Kill the field.  Also, as
->pid always equals ->serial_number and ->serial_number
doesn't have any special meaning anymore, update comments
above ->serial_number accordingly.  Once we remove all uses of
this field from all lldd's, this field should go.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 7ae13236788e..2a0e42ec27d3 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -7486,24 +7486,14 @@ static int ncr53c8xx_abort(struct scsi_cmnd *cmd)
         struct scsi_cmnd *done_list;
 
 #if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS
-        printk("ncr53c8xx_abort: pid=%lu serial_number=%ld serial_number_at_timeout=%ld\n",
-                cmd->pid, cmd->serial_number, cmd->serial_number_at_timeout);
+        printk("ncr53c8xx_abort: pid=%lu serial_number=%ld\n",
+                cmd->pid, cmd->serial_number);
 #else
         printk("ncr53c8xx_abort: command pid %lu\n", cmd->pid);
 #endif
 
         NCR_LOCK_NCB(np, flags);
 
-#if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS
-        /*
-         * We have to just ignore abort requests in some situations.
-         */
-        if (cmd->serial_number != cmd->serial_number_at_timeout) {
-                sts = SCSI_ABORT_NOT_RUNNING;
-                goto out;
-        }
-#endif
-
         sts = ncr_abort_command(np, cmd);
 out:
         done_list     = np->done_list;