Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7feac3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent beb40487

drivers/scsi/pluto.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -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

drivers/scsi/scsi_error.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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));

include/linux/blkdev.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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 */