mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-02 09:40:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: core: Clean up scsi_dev_queue_ready()

Browse source 
This is just a cleanup for scsi_dev_queue_ready() to avoid a redundant goto
and if statement. No functional change.

Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
Link: https://lore.kernel.org/r/20231018113746.1940197-2-haowenchao2@huawei.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Wenchao Hao 2023-10-18 19:37:45 +08:00 committed by Martin K. Petersen
parent 0b1b4b0444
commit 3dc985bfbd
1 changed files with 15 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/scsi/scsi_lib.c
View file

@ -1251,28 +1251,26 @@ static inline int scsi_dev_queue_ready(struct request_queue *q,
int token; int token;
token = sbitmap_get(&sdev->budget_map); token = sbitmap_get(&sdev->budget_map);
if (atomic_read(&sdev->device_blocked)) {
if (token < 0) if (token < 0)
goto out; return -1;
if (scsi_device_busy(sdev) > 1) if (!atomic_read(&sdev->device_blocked))
goto out_dec; return token;
/* /*
* unblock after device_blocked iterates to zero * Only unblock if no other commands are pending and
* if device_blocked has decreased to zero
*/ */
if (atomic_dec_return(&sdev->device_blocked) > 0) if (scsi_device_busy(sdev) > 1 ||
goto out_dec; atomic_dec_return(&sdev->device_blocked) > 0) {
SCSI_LOG_MLQUEUE(3, sdev_printk(KERN_INFO, sdev, sbitmap_put(&sdev->budget_map, token);
"unblocking device at zero depth\n")); return -1;
} }
SCSI_LOG_MLQUEUE(3, sdev_printk(KERN_INFO, sdev,
"unblocking device at zero depth\n"));
return token; return token;
out_dec:
if (token >= 0)
sbitmap_put(&sdev->budget_map, token);
out:
return -1;
} }
/* /*