Merge: scsi: core: Fix a regression triggered by scsi_host_busy()

CKI KWF Bot · CKI KWF Bot · commit 09e7a88a8f68 · 2025-11-13T11:12:00.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1704 scsi: core: Fix a regression triggered by scsi_host_busy() JIRA: https://issues.redhat.com/browse/RHEL-123046 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Chris Leech <cleech@redhat.com> Approved-by: John Meneghini <jmeneghi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
@@ -611,8 +611,9 @@ int scsi_host_busy(struct Scsi_Host *shost)
 {
 	int cnt = 0;
 
-	blk_mq_tagset_busy_iter(&shost->tag_set,
-				scsi_host_check_in_flight, &cnt);
+	if (shost->tag_set.ops)
+		blk_mq_tagset_busy_iter(&shost->tag_set,
+					scsi_host_check_in_flight, &cnt);
 	return cnt;
 }
 EXPORT_SYMBOL(scsi_host_busy);

Original file line number	Diff line number	Diff line change
`@@ -611,8 +611,9 @@ int scsi_host_busy(struct Scsi_Host *shost)`
`611`	`611`	`{`
`612`	`612`	`int cnt = 0;`
`613`	`613`
`614`		`- blk_mq_tagset_busy_iter(&shost->tag_set,`
`615`		`- scsi_host_check_in_flight, &cnt);`
	`614`	`+ if (shost->tag_set.ops)`
	`615`	`+ blk_mq_tagset_busy_iter(&shost->tag_set,`
	`616`	`+ scsi_host_check_in_flight, &cnt);`
`616`	`617`	`return cnt;`
`617`	`618`	`}`
`618`	`619`	`EXPORT_SYMBOL(scsi_host_busy);`