mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 03:45:24 -04:00
Merge "Revert "block: Fix use-after-free while iterating over requests""
This commit is contained in:
commit
41dc53c83f
2 changed files with 1 additions and 2 deletions
|
|
@ -497,7 +497,6 @@ static void __blk_mq_free_request(struct request *rq)
|
|||
const int sched_tag = rq->internal_tag;
|
||||
|
||||
blk_pm_mark_last_busy(rq);
|
||||
hctx->tags->rqs[rq->tag] = NULL;
|
||||
rq->mq_hctx = NULL;
|
||||
if (rq->tag != -1)
|
||||
blk_mq_put_tag(hctx, hctx->tags, ctx, rq->tag);
|
||||
|
|
|
|||
|
|
@ -209,7 +209,6 @@ static inline bool blk_mq_get_dispatch_budget(struct blk_mq_hw_ctx *hctx)
|
|||
static inline void __blk_mq_put_driver_tag(struct blk_mq_hw_ctx *hctx,
|
||||
struct request *rq)
|
||||
{
|
||||
hctx->tags->rqs[rq->tag] = NULL;
|
||||
blk_mq_put_tag(hctx, hctx->tags, rq->mq_ctx, rq->tag);
|
||||
rq->tag = -1;
|
||||
|
||||
|
|
@ -223,6 +222,7 @@ static inline void blk_mq_put_driver_tag(struct request *rq)
|
|||
{
|
||||
if (rq->tag == -1 || rq->internal_tag == -1)
|
||||
return;
|
||||
|
||||
__blk_mq_put_driver_tag(rq->mq_hctx, rq);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue