[PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

Christoph Hellwig Says:
=======================
I think we should just handle the error properly and remove the comment.
There's no good reason to ignore bsg registration errors.

In fact, after commit 92c4b58b15c5 ("scsi: core: Register sysfs attributes
earlier"), we are already forced to return errno.

We discuss this issue in [1].

[1] https://lore.kernel.org/all/20211022010201.426746-1-liu.yun@linux.dev/

Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/scsi/scsi_sysfs.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index f1e0c131b77c..322228faf8da 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1392,10 +1392,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
 	if (IS_ENABLED(CONFIG_BLK_DEV_BSG)) {
 		sdev->bsg_dev = scsi_bsg_register_queue(sdev);
 		if (IS_ERR(sdev->bsg_dev)) {
-			/*
-			 * We're treating error on bsg register as non-fatal, so
-			 * pretend nothing went wrong.
-			 */
 			error = PTR_ERR(sdev->bsg_dev);
 			sdev_printk(KERN_INFO, sdev,
 				    "Failed to register bsg queue, errno=%d\n",
-- 
2.25.1

Re: [PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[Guenter Roeck]

On 3/28/22 19:12, Jackie Liu wrote:
> From: Jackie Liu <liuyun01@kylinos.cn>
> 
> Christoph Hellwig Says:
> =======================
> I think we should just handle the error properly and remove the comment.
> There's no good reason to ignore bsg registration errors.
> 
> In fact, after commit 92c4b58b15c5 ("scsi: core: Register sysfs attributes
> earlier"), we are already forced to return errno.
> 
> We discuss this issue in [1].
> 
> [1] https://lore.kernel.org/all/20211022010201.426746-1-liu.yun@linux.dev/
> 
> Suggested-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/scsi/scsi_sysfs.c | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index f1e0c131b77c..322228faf8da 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -1392,10 +1392,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
>   	if (IS_ENABLED(CONFIG_BLK_DEV_BSG)) {
>   		sdev->bsg_dev = scsi_bsg_register_queue(sdev);
>   		if (IS_ERR(sdev->bsg_dev)) {
> -			/*
> -			 * We're treating error on bsg register as non-fatal, so
> -			 * pretend nothing went wrong.
> -			 */
>   			error = PTR_ERR(sdev->bsg_dev);
>   			sdev_printk(KERN_INFO, sdev,
>   				    "Failed to register bsg queue, errno=%d\n",

Re: [PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[Christoph Hellwig]

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[Martin K. Petersen]

Jackie,

> I think we should just handle the error properly and remove the
> comment.  There's no good reason to ignore bsg registration errors.

Applied to 5.18/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: core: sysfs: remove comments that conflict with the actual logic

[Martin K. Petersen]

On Tue, 29 Mar 2022 10:12:51 +0800, Jackie Liu wrote:

> From: Jackie Liu <liuyun01@kylinos.cn>
> 
> Christoph Hellwig Says:
> =======================
> I think we should just handle the error properly and remove the comment.
> There's no good reason to ignore bsg registration errors.
> 
> [...]

Applied to 5.18/scsi-fixes, thanks!

[1/1] scsi: core: sysfs: remove comments that conflict with the actual logic
      https://git.kernel.org/mkp/scsi/c/99241e119f4a

-- 
Martin K. Petersen	Oracle Linux Engineering