[PATCH 1/2] fs: bdev: fix conflicting comment from lookup_bdev

From: Jackie Liu <redacted>

We switched to directly use dev_t to get block device, lookup changed the
meaning of use, now we fix this conflicting comment.

Fixes: 4e7b5671c6a8 ("block: remove i_bdev")
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Jackie Liu <redacted>
---
 block/bdev.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/block/bdev.c b/block/bdev.c
index 485a258b0ab3..51d69243d315 100644
--- a/block/bdev.c
+++ b/block/bdev.c

@@ -962,9 +962,11 @@ EXPORT_SYMBOL(blkdev_put);
  * @pathname:	special file representing the block device
  * @dev:	return value of the block device's dev_t
  *
- * Get a reference to the blockdevice at @pathname in the current
- * namespace if possible and return it.  Return ERR_PTR(error)
- * otherwise.
+ * Lookup the block device's dev_t at @pathname in the current
+ * namespace if possible and return it by @dev.
+ *
+ * RETURNS:
+ * 0 if succeeded, errno otherwise.
  */
 int lookup_bdev(const char *pathname, dev_t *dev)
 {

-- 
2.25.1

From: Jackie Liu <redacted>

When the value of error is printed, it will always be 0. Here, we should be
print the correct error code when scsi_bsg_register_queue fails.

Fixes: ead09dd3aed5 ("scsi: bsg: Simplify device registration")
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jackie Liu <redacted>
---
 drivers/scsi/scsi_sysfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 86793259e541..d8789f6cda62 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c

@@ -1379,6 +1379,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
 			 * 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",
 				    error);

-- 
2.25.1

Looks good,

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

Looks good,

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

On Thu, 21 Oct 2021 15:13:43 +0800, Jackie Liu wrote:

From: Jackie Liu <redacted>

We switched to directly use dev_t to get block device, lookup changed the
meaning of use, now we fix this conflicting comment.

Applied, thanks!

[1/2] fs: bdev: fix conflicting comment from lookup_bdev
      commit: 057178cf518e699695a4b614a7a08c350b1fdcfd
[2/2] scsi: bsg: fix errno when scsi_bsg_register_queue fails
      commit: e85c8915cf374af76efdc03a53a20fdec9d8eb5a

Best regards,
-- 
Jens Axboe

On 10/21/21 8:24 AM, Jens Axboe wrote:

On Thu, 21 Oct 2021 15:13:43 +0800, Jackie Liu wrote:

quoted

From: Jackie Liu <redacted>

We switched to directly use dev_t to get block device, lookup changed the
meaning of use, now we fix this conflicting comment.

Applied, thanks!

[1/2] fs: bdev: fix conflicting comment from lookup_bdev
      commit: 057178cf518e699695a4b614a7a08c350b1fdcfd
[2/2] scsi: bsg: fix errno when scsi_bsg_register_queue fails
      commit: e85c8915cf374af76efdc03a53a20fdec9d8eb5a

Eh, I only applied 1/2. The other can go through the SCSI tree.

-- 
Jens Axboe