Commit c3419fd6 authored Oct 18, 2019 by Linus Torvalds

scsi

Pull scsi fixes from Martin Petersen:
 "These two commits were in a separate postmerge branch due to a
  dependency on changes merged for 5.4 in the block tree.

  They fix two issues in the intersection of the request cleanup changes
  from block (b7e9e1fb) and the request batching changes
  (8930a6c2) that were made to SCSI during the 5.4 cycle"

* tag 'mkp-scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi:
  scsi: core: fix dh and multipathing for SCSI hosts without request batching
  scsi: core: fix missing .cleanup_rq for SCSI hosts without request batching

parents 0e2adab6 6b6fa7a5

drivers/scsi/scsi_lib.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1834,6 +1834,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = {
		.init_request = scsi_mq_init_request,
		.exit_request = scsi_mq_exit_request,
		.initialize_rq_fn = scsi_initialize_rq,
		.cleanup_rq = scsi_cleanup_rq,
		.busy = scsi_mq_lld_busy,
		.map_queues = scsi_map_queues,
		};
		@@ -1921,7 +1922,8 @@ struct scsi_device scsi_device_from_queue(struct request_queue q)
		{
		struct scsi_device *sdev = NULL;

		if (q->mq_ops == &scsi_mq_ops)
		if (q->mq_ops == &scsi_mq_ops_no_commit \|\|
		q->mq_ops == &scsi_mq_ops)
		sdev = q->queuedata;
		if (!sdev \|\| !get_device(&sdev->sdev_gendev))
		sdev = NULL;

Admin message