path: root/block/blk-exec.c
diff options
authorChristoph Hellwig <>2014-09-16 14:44:07 -0700
committerJens Axboe <>2014-09-22 11:55:19 -0600
commita57a178a490345c7236b0077b3de005754389ed6 (patch)
tree7d5fa8c1c9df7a70e367f78297545c253c890926 /block/blk-exec.c
parent683d0e126232d898a481daa3a4ca032c2b1a9660 (diff)
blk-mq: avoid infinite recursion with the FUA flag
We should not insert requests into the flush state machine from blk_mq_insert_request. All incoming flush requests come through blk_{m,s}q_make_request and are handled there, while blk_execute_rq_nowait should only be called for BLOCK_PC requests. All other callers deal with requests that already went through the flush statemchine and shouldn't be reinserted into it. Reported-by: Robert Elliott <> Debugged-by: Ming Lei <> Signed-off-by: Christoph Hellwig <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block/blk-exec.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index f4d27b1..9924725 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -56,6 +56,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
bool is_pm_resume;
+ WARN_ON(rq->cmd_type == REQ_TYPE_FS);
rq->rq_disk = bd_disk;
rq->end_io = done;