diff options
| author | Shaohua Li <shli@fb.com> | 2015-05-01 09:59:44 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-04 13:09:55 -0600 |
| commit | b2387ddcced8de3e6471a2fb16a409577063016f (patch) | |
| tree | bd13a1c05ec6b788aab5d53f855b64adeb1a9fdd /include | |
| parent | 6cd18e711dd8075da9d78cfc1239f912ff28968a (diff) | |
| download | linux-stable-b2387ddcced8de3e6471a2fb16a409577063016f.tar.gz linux-stable-b2387ddcced8de3e6471a2fb16a409577063016f.tar.bz2 linux-stable-b2387ddcced8de3e6471a2fb16a409577063016f.zip | |
blk-mq: fix FUA request hang
When a FUA request enters its DATA stage of flush pipeline, the
request is added to mq requeue list, the request will then be added to
ctx->rq_list. blk_mq_attempt_merge() might merge the request with a bio.
Later when the request is finished the flush pipeline, the
request->__data_len is 0. Then I only saw the bio gets endio called, the
original request never finish.
Adding REQ_FLUSH_SEQ into REQ_NOMERGE_FLAGS looks an easy fix.
stable: 3.15+
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index a1b25e35ea5f..b7299febc4b4 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -220,7 +220,7 @@ enum rq_flag_bits { /* This mask is used for both bio and request merge checking */ #define REQ_NOMERGE_FLAGS \ - (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA) + (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_FLUSH_SEQ) #define REQ_RAHEAD (1ULL << __REQ_RAHEAD) #define REQ_THROTTLED (1ULL << __REQ_THROTTLED) |