2018-04-02 09:39:23

by Johannes Thumshirn

[permalink] [raw]
Subject: [PATCH] scsi: hosts: remove redundant assingment of shost->use_blk_mq

Coverity reports that we're assigning shost->use_blk_mq twice. This
looks like the result of a bad merge of commit 2f31115e940c ("scsi:
core: introduce force_blk_mq")

Signed-off-by: Johannes Thumshirn <[email protected]>
---
drivers/scsi/hosts.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index ef22b275d050..c36f2a44e5ed 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -473,7 +473,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
else
shost->dma_boundary = 0xffffffff;

- shost->use_blk_mq = scsi_use_blk_mq;
shost->use_blk_mq = scsi_use_blk_mq || shost->hostt->force_blk_mq;

device_initialize(&shost->shost_gendev);
--
2.16.2



2018-04-02 13:54:38

by Bart Van Assche

[permalink] [raw]
Subject: Re: [PATCH] scsi: hosts: remove redundant assingment of shost->use_blk_mq

On Mon, 2018-04-02 at 11:37 +0200, Johannes Thumshirn wrote:
> Coverity reports that we're assigning shost->use_blk_mq twice. This
> looks like the result of a bad merge of commit 2f31115e940c ("scsi:
> core: introduce force_blk_mq")
>
> Signed-off-by: Johannes Thumshirn <[email protected]>
> ---
> drivers/scsi/hosts.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
> index ef22b275d050..c36f2a44e5ed 100644
> --- a/drivers/scsi/hosts.c
> +++ b/drivers/scsi/hosts.c
> @@ -473,7 +473,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
> else
> shost->dma_boundary = 0xffffffff;
>
> - shost->use_blk_mq = scsi_use_blk_mq;
> shost->use_blk_mq = scsi_use_blk_mq || shost->hostt->force_blk_mq;
>
> device_initialize(&shost->shost_gendev);

A similar patch has already been queued by Martin. See also
https://patchwork.kernel.org/patch/10313569/.

Bart.


2018-04-03 07:42:20

by Johannes Thumshirn

[permalink] [raw]
Subject: Re: [PATCH] scsi: hosts: remove redundant assingment of shost->use_blk_mq

On Mon, 2018-04-02 at 13:53 +0000, Bart Van Assche wrote:
> A similar patch has already been queued by Martin. See also
> https://patchwork.kernel.org/patch/10313569/.

Ah OK, fine then :-)
--
Johannes Thumshirn Storage
[email protected] +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850