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

Commit 1f8c88c3 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

[SCSI] dpt_i2o: Remove DPTI_STATE_IOCTL 



scsi_block_host/scsi_unlock_host provides the required
functionality.

[jejb: checkpatch fixes]
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 999ece0a

drivers/scsi/dpt_i2o.c

+12 −18
Original line number Diff line number Diff line
@@ -448,15 +448,7 @@ static int adpt_queue_lck(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd 
	}



	rmb();

	/*

	 * TODO: I need to block here if I am processing ioctl cmds

	 * but if the outstanding cmds all finish before the ioctl,

	 * the scsi-core will not know to start sending cmds to me again.

	 * I need to a way to restart the scsi-cores queues or should I block

	 * calling scsi_done on the outstanding cmds instead

	 * for now we don't set the IOCTL state

	 */

	if(((pHba->state) & DPTI_STATE_IOCTL) || ((pHba->state) & DPTI_STATE_RESET)) {

	if ((pHba->state) & DPTI_STATE_RESET) {

		pHba->host->last_reset = jiffies;

		pHba->host->resetting = 1;

		return 1;
@@ -1811,20 +1803,22 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg) 
	}



	do {

		if(pHba->host)

		/*

		 * Stop any new commands from enterring the

		 * controller while processing the ioctl

		 */

		if (pHba->host) {

			scsi_block_requests(pHba->host);

			spin_lock_irqsave(pHba->host->host_lock, flags);

		// This state stops any new commands from enterring the

		// controller while processing the ioctl

//		pHba->state |= DPTI_STATE_IOCTL;

//		We can't set this now - The scsi subsystem sets host_blocked and

//		the queue empties and stops.  We need a way to restart the queue

		}

		rcode = adpt_i2o_post_wait(pHba, msg, size, FOREVER);

		if (rcode != 0)

			printk("adpt_i2o_passthru: post wait failed %d %p\n",

					rcode, reply);

//		pHba->state &= ~DPTI_STATE_IOCTL;

		if(pHba->host)

		if (pHba->host) {

			spin_unlock_irqrestore(pHba->host->host_lock, flags);

			scsi_unblock_requests(pHba->host);

		}

	} while (rcode == -ETIMEDOUT);



	if(rcode){

drivers/scsi/dpti.h

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ struct adpt_channel { 


// HBA state flags

#define DPTI_STATE_RESET	(0x01)

#define DPTI_STATE_IOCTL	(0x02)



typedef struct _adpt_hba {

	struct _adpt_hba *next;