diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-07-01 22:58:32 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-07-01 22:58:32 -0600 |
| commit | 4e2f62e566b5bddec00682f36a404e05a3b64b6a (patch) | |
| tree | 25a8ce0db9465f8c3f9e3f78b0098b54ab9cc636 /block/blk.h | |
| parent | b53ac8b89157b5ff5d46c07eaa8b12e9d4e63b34 (diff) | |
| download | linux-stable-4e2f62e566b5bddec00682f36a404e05a3b64b6a.tar.gz linux-stable-4e2f62e566b5bddec00682f36a404e05a3b64b6a.tar.bz2 linux-stable-4e2f62e566b5bddec00682f36a404e05a3b64b6a.zip | |
Revert "blk-mq: put driver tag when this request is completed"
This reverts commits the following commits:
37f4a24c2469a10a4c16c641671bd766e276cf9f
723bf178f158abd1ce6069cb049581b3cb003aab
36a3df5a4574d5ddf59804fcd0c4e9654c514d9a
The last one is the culprit, but we have to go a bit deeper to get this
to revert cleanly. There's been a report that this breaks some MMC
setups [1], and also causes an issue with swap [2]. Until this can be
figured out, revert the offending commits.
[1] https://lore.kernel.org/linux-block/57fb09b1-54ba-f3aa-f82c-d709b0e6b281@samsung.com/
[2] https://lore.kernel.org/linux-block/20200702043721.GA1087@lca.pw/
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/blk.h b/block/blk.h index 9dcf51c94096..94f7c084f68f 100644 --- a/block/blk.h +++ b/block/blk.h @@ -25,6 +25,11 @@ struct blk_flush_queue { struct list_head flush_data_in_flight; struct request *flush_rq; + /* + * flush_rq shares tag with this rq, both can't be active + * at the same time + */ + struct request *orig_rq; struct lock_class_key key; spinlock_t mq_flush_lock; }; |