Commit 80b60510 authored by Yu Kuai's avatar Yu Kuai Committed by Martin K. Petersen
Browse files

scsi: sg: Fix checking return value of blk_get_queue() 



Commit fcaa174a ("scsi/sg: don't grab scsi host module reference") make
a mess how blk_get_queue() is called, blk_get_queue() returns true on
success while the caller expects it returns 0 on success.

Fix this problem and also add a corresponding error message on failure.

Fixes: fcaa174a ("scsi/sg: don't grab scsi host module reference")
Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Closes: https://lore.kernel.org/all/87lefv622n.fsf@linux.ibm.com/


Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20230705024001.177585-1-yukuai1@huaweicloud.com


Tested-by: default avatarShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Tested-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f4d1a8e0

drivers/scsi/sg.c

+4 −3
Original line number Diff line number Diff line
@@ -1497,9 +1497,10 @@ sg_add_device(struct device *cl_dev) 
	int error;

	unsigned long iflags;



	error = blk_get_queue(scsidp->request_queue);

	if (error)

		return error;

	if (!blk_get_queue(scsidp->request_queue)) {

		pr_warn("%s: get scsi_device queue failed\n", __func__);

		return -ENODEV;

	}



	error = -ENOMEM;

	cdev = cdev_alloc();