diff options
author | Ming Lei <[email protected]> | 2023-04-20 19:20:18 +0800 |
---|---|---|
committer | Jens Axboe <[email protected]> | 2023-04-20 06:54:17 -0600 |
commit | 81ea1222f2fa5006f4b9759c2fe1ec154109622d (patch) | |
tree | 3e62a64a9df6d8d8a1ca898e8596c21f3a99cd82 /net/unix/af_unix.c | |
parent | f7ca1ae32bd89ab035568c63b4443eb55420b423 (diff) |
Revert "block: Merge bio before checking ->cached_rq"
This reverts commit 23f3e3272e7a4d9fb870485cd6df1e4f9539282c.
blk-mq sched bio merge still needs request to grab queue usage counter,
so we can't simply call blk_mq_attempt_bio_merge() when queue usage
counter isn't held.
Fixes: 23f3e3272e7a ("block: Merge bio before checking ->cached_rq")
Cc: Xiao Ni <[email protected]>
Reported-by: Yi Zhang <[email protected]>
Signed-off-by: Ming Lei <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions