Commit 66483a4a authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: Introduce scsi_start_queue() 



This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Israel Rukshin <israelr@mellanox.com>
Cc: Max Gurtovoy <maxg@mellanox.com>
Cc: Benjamin Block <bblock@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0db6ca8a

drivers/scsi/scsi_lib.c

+15 −10
Original line number Diff line number Diff line
@@ -3031,6 +3031,20 @@ static int scsi_internal_device_block(struct scsi_device *sdev) 
	return err;

}

 

void scsi_start_queue(struct scsi_device *sdev)

{

	struct request_queue *q = sdev->request_queue;

	unsigned long flags;



	if (q->mq_ops) {

		blk_mq_start_stopped_hw_queues(q, false);

	} else {

		spin_lock_irqsave(q->queue_lock, flags);

		blk_start_queue(q);

		spin_unlock_irqrestore(q->queue_lock, flags);

	}

}



/**

 * scsi_internal_device_unblock_nowait - resume a device after a block request

 * @sdev:	device to resume
@@ -3049,9 +3063,6 @@ static int scsi_internal_device_block(struct scsi_device *sdev) 
int scsi_internal_device_unblock_nowait(struct scsi_device *sdev,

					enum scsi_device_state new_state)

{

	struct request_queue *q = sdev->request_queue; 

	unsigned long flags;



	/*

	 * Try to transition the scsi device to SDEV_RUNNING or one of the

	 * offlined states and goose the device queue if successful.
@@ -3069,13 +3080,7 @@ int scsi_internal_device_unblock_nowait(struct scsi_device *sdev, 
		 sdev->sdev_state != SDEV_OFFLINE)

		return -EINVAL;



	if (q->mq_ops) {

		blk_mq_start_stopped_hw_queues(q, false);

	} else {

		spin_lock_irqsave(q->queue_lock, flags);

		blk_start_queue(q);

		spin_unlock_irqrestore(q->queue_lock, flags);

	}

	scsi_start_queue(sdev);



	return 0;

}

drivers/scsi/scsi_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ extern void scsi_run_host_queues(struct Scsi_Host *shost); 
extern void scsi_requeue_run_queue(struct work_struct *work);

extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev);

extern struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev);

extern void scsi_start_queue(struct scsi_device *sdev);

extern int scsi_mq_setup_tags(struct Scsi_Host *shost);

extern void scsi_mq_destroy_tags(struct Scsi_Host *shost);

extern int scsi_init_queue(void);