Skip to content

Commit 23aa8e6

Browse files
Ming Leimartinkpetersen
authored andcommitted
Revert "scsi: core: fix scsi_host_queue_ready"
This reverts commit 265d59a. There is fundamental issue in commit 3287286 (scsi: core: avoid host-wide host_busy counter for scsi_mq) because SCSI's host busy counter may not be same with counter of blk-mq's inflight tags, especially in case of none io scheduler. So revert this commit first. Cc: Omar Sandoval <[email protected]>, Cc: "Martin K. Petersen" <[email protected]>, Cc: James Bottomley <[email protected]>, Cc: Christoph Hellwig <[email protected]>, Cc: Don Brace <[email protected]> Cc: Kashyap Desai <[email protected]> Cc: Mike Snitzer <[email protected]> Cc: Hannes Reinecke <[email protected]> Cc: Laurence Oberman <[email protected]> Cc: Bart Van Assche <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: Jens Axboe <[email protected]> Reported-by: Jens Axboe <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 4e8065a commit 23aa8e6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/scsi/scsi_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
16111611
else
16121612
busy = 0;
16131613
if (atomic_read(&shost->host_blocked) > 0) {
1614-
if (busy)
1614+
if (busy || scsi_host_busy(shost))
16151615
goto starved;
16161616

16171617
/*

0 commit comments

Comments
 (0)