xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.20-rc3' into for-4.21/block

Browse Source 
Merge in -rc3 to resolve a few conflicts, but also to get a few
important fixes that have gone into mainline since the block
4.21 branch was forked off (most notably the SCSI queue issue,
which is both a conflict AND needed fix).

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2018-11-18 15:46:03 -07:00
parent fce15a609f 9ff01193a2
commit a78b03bc73
396 changed files with 4319 additions and 2033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/scsi_lib.c
View File

@@ -610,6 +610,12 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
*/
scsi_mq_uninit_cmd(cmd);
/*
* queue is still alive, so grab the ref for preventing it
* from being cleaned up during running queue.
*/
percpu_ref_get(&q->q_usage_counter);
__blk_mq_end_request(req, error);
if (scsi_target(sdev)->single_lun ||
@@ -618,6 +624,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
else
blk_mq_run_hw_queues(q, true);
percpu_ref_put(&q->q_usage_counter);
put_device(&sdev->sdev_gendev);
return false;
}