Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8d7feac3c7504425aaf61dc7d804685a6b89ee43

Authored by Christoph Hellwig
Committed by James Bottomley
1 parent beb4048750

[SCSI] remove RQ_SCSI_* flags 

The RQ_SCSI_* flags are a vestiage of a long past history.  The EH code
still sets them but we never make use of that information.  The other
users is pluto.c which never had a chance to work but needs to be kept
compiling to keep Davem happy, so copy over the definition there.

We could probably get rid of RQ_ACTIVE/RQ_INACTIVE aswell with some
work, there's only two more or less bogus looking uses in ubd and scsi.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Showing 3 changed files with 3 additions and 6 deletions Side-by-side Diff

drivers/scsi/pluto.c
Diff comments   View file @ 8d7feac
... ... @@ -27,6 +27,9 @@
27 27  
28 28 #include <linux/module.h>
29 29  
  30 +#define RQ_SCSI_BUSY 0xffff
  31 +#define RQ_SCSI_DONE 0xfffe
  32 +
30 33 /* #define PLUTO_DEBUG */
31 34  
32 35 #define pluto_printk printk ("PLUTO %s: ", fc->name); printk
drivers/scsi/scsi_error.c
Diff comments   View file @ 8d7feac
... ... @@ -452,7 +452,6 @@
452 452 (sdev->lun << 5 & 0xe0);
453 453  
454 454 shost->eh_action = &done;
455   - scmd->request->rq_status = RQ_SCSI_BUSY;
456 455  
457 456 spin_lock_irqsave(shost->host_lock, flags);
458 457 scsi_log_send(scmd);
... ... @@ -461,7 +460,6 @@
461 460  
462 461 timeleft = wait_for_completion_timeout(&done, timeout);
463 462  
464   - scmd->request->rq_status = RQ_SCSI_DONE;
465 463 shost->eh_action = NULL;
466 464  
467 465 scsi_log_completion(scmd, SUCCESS);
... ... @@ -1657,7 +1655,6 @@
1657 1655  
1658 1656 scmd->request = &req;
1659 1657 memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
1660   - scmd->request->rq_status = RQ_SCSI_BUSY;
1661 1658  
1662 1659 memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));
1663 1660  
include/linux/blkdev.h
Diff comments   View file @ 8d7feac
... ... @@ -439,9 +439,6 @@
439 439  
440 440 #define RQ_INACTIVE (-1)
441 441 #define RQ_ACTIVE 1
442   -#define RQ_SCSI_BUSY 0xffff
443   -#define RQ_SCSI_DONE 0xfffe
444   -#define RQ_SCSI_DISCONNECTING 0xffe0
445 442  
446 443 #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */
447 444 #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */