On Wed, Aug 7, 2019 at 10:55 PM Steffen Maier <maier@xxxxxxxxxxxxx> wrote:
>
> This was missing from scsi_mq_ops_no_commit of linux-next commit
> 8930a6c20791 ("scsi: core: add support for request batching")
> from Martin's scsi/5.4/scsi-queue or James' scsi/misc.
>
> See also linux-next commit b7e9e1fb7a92 ("scsi: implement .cleanup_rq
> callback") from block/for-next.
>
> Signed-off-by: Steffen Maier <maier@xxxxxxxxxxxxx>
> Fixes: 8930a6c20791 ("scsi: core: add support for request batching")
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Cc: Ming Lei <ming.lei@xxxxxxxxxx>
> ---
> drivers/scsi/scsi_lib.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index ae03d3e2600f..90c257622bb0 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -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,
> };
This one is a cross-tree thing, either scsi/5.4/scsi-queue needs to
pull for-5.4/block, or
do it after both land linus tree.
Thanks,
Ming Lei
