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

Commit bb3ec62a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove scsi_next_command 



There's only one caller left, so inline it and reduce the blk-mq vs !blk-mq
diff a litte bit.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 0f121dd8

drivers/scsi/scsi_lib.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -543,17 +543,6 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) 
	put_device(&sdev->sdev_gendev);

	put_device(&sdev->sdev_gendev);

}

}





void scsi_next_command(struct scsi_cmnd *cmd)

{

	struct scsi_device *sdev = cmd->device;

	struct request_queue *q = sdev->request_queue;



	scsi_put_command(cmd);

	scsi_run_queue(q);



	put_device(&sdev->sdev_gendev);

}



void scsi_run_host_queues(struct Scsi_Host *shost)

void scsi_run_host_queues(struct Scsi_Host *shost)

{

{

	struct scsi_device *sdev;

	struct scsi_device *sdev;
@@ -731,8 +720,6 @@ static bool scsi_end_request(struct request *req, int error, 
			kblockd_schedule_work(&sdev->requeue_work);

			kblockd_schedule_work(&sdev->requeue_work);

		else

		else

			blk_mq_start_stopped_hw_queues(q, true);

			blk_mq_start_stopped_hw_queues(q, true);



		put_device(&sdev->sdev_gendev);

	} else {

	} else {

		unsigned long flags;

		unsigned long flags;
@@ -744,9 +731,12 @@ static bool scsi_end_request(struct request *req, int error, 
		spin_unlock_irqrestore(q->queue_lock, flags);

		spin_unlock_irqrestore(q->queue_lock, flags);





		scsi_release_buffers(cmd);

		scsi_release_buffers(cmd);

		scsi_next_command(cmd);



		scsi_put_command(cmd);

		scsi_run_queue(q);

	}

	}





	put_device(&sdev->sdev_gendev);

	return false;

	return false;

}

}

drivers/scsi/scsi_priv.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd); 
extern int scsi_maybe_unblock_host(struct scsi_device *sdev);

extern int scsi_maybe_unblock_host(struct scsi_device *sdev);

extern void scsi_device_unbusy(struct scsi_device *sdev);

extern void scsi_device_unbusy(struct scsi_device *sdev);

extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);

extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);

extern void scsi_next_command(struct scsi_cmnd *cmd);

extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);

extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);

extern void scsi_run_host_queues(struct Scsi_Host *shost);

extern void scsi_run_host_queues(struct Scsi_Host *shost);

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

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