leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] remove RQ_SCSI_* flags

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2006-06-10 18:37:19 +02:00 committed by James Bottomley
parent beb4048750
commit 8d7feac3c7
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/pluto.c
View File

@ -27,6 +27,9 @@
#include <linux/module.h> #include <linux/module.h>
#define RQ_SCSI_BUSY 0xffff
#define RQ_SCSI_DONE 0xfffe
/* #define PLUTO_DEBUG */ /* #define PLUTO_DEBUG */
#define pluto_printk printk ("PLUTO %s: ", fc->name); printk #define pluto_printk printk ("PLUTO %s: ", fc->name); printk

3
drivers/scsi/scsi_error.c
View File

@ -452,7 +452,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
(sdev->lun << 5 & 0xe0); (sdev->lun << 5 & 0xe0);
shost->eh_action = &done; shost->eh_action = &done;
scmd->request->rq_status = RQ_SCSI_BUSY;
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
scsi_log_send(scmd); scsi_log_send(scmd);
@ -461,7 +460,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
timeleft = wait_for_completion_timeout(&done, timeout); timeleft = wait_for_completion_timeout(&done, timeout);
scmd->request->rq_status = RQ_SCSI_DONE;
shost->eh_action = NULL; shost->eh_action = NULL;
scsi_log_completion(scmd, SUCCESS); scsi_log_completion(scmd, SUCCESS);
@ -1657,7 +1655,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
scmd->request = &req; scmd->request = &req;
memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
scmd->request->rq_status = RQ_SCSI_BUSY;
memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd)); memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));

3
include/linux/blkdev.h
View File

@ -439,9 +439,6 @@ struct request_queue
#define RQ_INACTIVE (-1) #define RQ_INACTIVE (-1)
#define RQ_ACTIVE 1 #define RQ_ACTIVE 1
#define RQ_SCSI_BUSY 0xffff
#define RQ_SCSI_DONE 0xfffe
#define RQ_SCSI_DISCONNECTING 0xffe0
#define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */
#define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */ #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */