iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: pass failfast and driver-specific flags to flush requests

Browse Source 
If flush requests are being sent to the device we need to inherit the
failfast and driver-specific flags, too, otherwise I/O will fail.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Hannes Reinecke 2018-06-06 16:21:40 +02:00 committed by Jens Axboe
parent 07ce213f63
commit 84fca1b0c4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/blk-flush.c
View File

@ -94,7 +94,7 @@ enum {
}; };
static bool blk_kick_flush(struct request_queue *q, static bool blk_kick_flush(struct request_queue *q,
struct blk_flush_queue *fq); struct blk_flush_queue *fq, unsigned int flags);
static unsigned int blk_flush_policy(unsigned long fflags, struct request *rq) static unsigned int blk_flush_policy(unsigned long fflags, struct request *rq)
{ {
@ -212,7 +212,7 @@ static bool blk_flush_complete_seq(struct request *rq,
BUG(); BUG();
} }
kicked = blk_kick_flush(q, fq); kicked = blk_kick_flush(q, fq, rq->cmd_flags);
return kicked | queued; return kicked | queued;
} }
@ -281,6 +281,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
* blk_kick_flush - consider issuing flush request * blk_kick_flush - consider issuing flush request
* @q: request_queue being kicked * @q: request_queue being kicked
* @fq: flush queue * @fq: flush queue
* @flags: cmd_flags of the original request
* *
* Flush related states of @q have changed, consider issuing flush request. * Flush related states of @q have changed, consider issuing flush request.
* Please read the comment at the top of this file for more info. * Please read the comment at the top of this file for more info.
@ -291,7 +292,8 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)
* RETURNS: * RETURNS:
* %true if flush was issued, %false otherwise. * %true if flush was issued, %false otherwise.
*/ */
static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq) static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
unsigned int flags)
{ {
struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx]; struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];
struct request *first_rq = struct request *first_rq =
@ -346,6 +348,7 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)
} }
flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH; flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;
flush_rq->cmd_flags |= (flags & REQ_DRV) | (flags & REQ_FAILFAST_MASK);
flush_rq->rq_flags |= RQF_FLUSH_SEQ; flush_rq->rq_flags |= RQF_FLUSH_SEQ;
flush_rq->rq_disk = first_rq->rq_disk; flush_rq->rq_disk = first_rq->rq_disk;
flush_rq->end_io = flush_end_io; flush_rq->end_io = flush_end_io;