diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-11-01 14:40:10 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-11-01 16:43:26 +0100 |
| commit | 70fd76140a6cb63262bd47b68d57b42e889c10ee (patch) | |
| tree | 0590b2ef1b89b6af6abb8da9d23d5d87991d74c8 /block/blk-flush.c | |
| parent | block: replace REQ_NOIDLE with REQ_IDLE (diff) | |
| download | linux-70fd76140a6cb63262bd47b68d57b42e889c10ee.tar.xz linux-70fd76140a6cb63262bd47b68d57b42e889c10ee.zip | |
block,fs: use REQ_* flags directly
Remove the WRITE_* and READ_SYNC wrappers, and just use the flags
directly. Where applicable this also drops usage of the
bio_set_op_attrs wrapper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-flush.c')
| -rw-r--r-- | block/blk-flush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c index 95f1d4d357df..d35beca18481 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -330,7 +330,7 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq) } flush_rq->cmd_type = REQ_TYPE_FS; - flush_rq->cmd_flags = REQ_OP_FLUSH | WRITE_FLUSH; + flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH; flush_rq->rq_flags |= RQF_FLUSH_SEQ; flush_rq->rq_disk = first_rq->rq_disk; flush_rq->end_io = flush_end_io; @@ -486,7 +486,7 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, bio = bio_alloc(gfp_mask, 0); bio->bi_bdev = bdev; - bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH); + bio->bi_opf = REQ_OP_WRITE | REQ_PREFLUSH; ret = submit_bio_wait(bio); |