2022-01-07 02:23:15

by CGEL

Subject: [PATCH] nvme-fabrics: remove unneeded variable

From: Changcheng Deng <[email protected]>

Remove unneeded variable used to store return value.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Changcheng Deng <[email protected]>
---
drivers/nvme/host/fabrics.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 7ae041e2b3fb..f79a66d4e22c 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -1092,7 +1092,6 @@ static void __nvmf_concat_opt_tokens(struct seq_file *seq_file)
static int nvmf_dev_show(struct seq_file *seq_file, void *private)
{
struct nvme_ctrl *ctrl;
- int ret = 0;

mutex_lock(&nvmf_dev_mutex);
ctrl = seq_file->private;
@@ -1106,7 +1105,7 @@ static int nvmf_dev_show(struct seq_file *seq_file, void *private)

out_unlock:
mutex_unlock(&nvmf_dev_mutex);
- return ret;
+ return 0;
}

static int nvmf_dev_open(struct inode *inode, struct file *file)
--
2.25.1

2022-01-09 12:53:25

by Sagi Grimberg

Subject: Re: [PATCH] nvme-fabrics: remove unneeded variable

> From: Changcheng Deng <[email protected]>
>
> Remove unneeded variable used to store return value.

I actually think that ret is missing an assignment in the error
case (e.g ret = -ENODEV)...

>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Changcheng Deng <[email protected]>
> ---
> drivers/nvme/host/fabrics.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
> index 7ae041e2b3fb..f79a66d4e22c 100644
> --- a/drivers/nvme/host/fabrics.c
> +++ b/drivers/nvme/host/fabrics.c
> @@ -1092,7 +1092,6 @@ static void __nvmf_concat_opt_tokens(struct seq_file *seq_file)
> static int nvmf_dev_show(struct seq_file *seq_file, void *private)
> {
> struct nvme_ctrl *ctrl;
> - int ret = 0;
>
> mutex_lock(&nvmf_dev_mutex);
> ctrl = seq_file->private;
> @@ -1106,7 +1105,7 @@ static int nvmf_dev_show(struct seq_file *seq_file, void *private)
>
> out_unlock:
> mutex_unlock(&nvmf_dev_mutex);
> - return ret;
> + return 0;
> }
>
> static int nvmf_dev_open(struct inode *inode, struct file *file)
>

2022-01-26 22:15:52

by Christoph Hellwig

Subject: Re: [PATCH] nvme-fabrics: remove unneeded variable

Thanks,

applied to nvme-5.17.