diff options
| author | Jens Axboe <axboe@fb.com> | 2016-08-05 23:35:16 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-08-07 22:41:02 +0200 |
| commit | 1eff9d322a444245c67515edb52bc0eb68374aa8 (patch) | |
| tree | aed4c3bfdf94202b93b9b5ce74c6e247f4c3ab85 /block/blk-merge.c | |
| parent | target: iblock_execute_sync_cache() should use bio_set_op_attrs() (diff) | |
| download | linux-1eff9d322a444245c67515edb52bc0eb68374aa8.tar.xz linux-1eff9d322a444245c67515edb52bc0eb68374aa8.zip | |
block: rename bio bi_rw to bi_opf
Since commit 63a4cc24867d, bio->bi_rw contains flags in the lower
portion and the op code in the higher portions. This means that
old code that relies on manually setting bi_rw is most likely
going to be broken. Instead of letting that brokeness linger,
rename the member, to force old and out-of-tree code to break
at compile time instead of at runtime.
No intended functional changes in this commit.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 41cbd4878958..3eec75a9e91d 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -186,7 +186,7 @@ void blk_queue_split(struct request_queue *q, struct bio **bio, if (split) { /* there isn't chance to merge the splitted bio */ - split->bi_rw |= REQ_NOMERGE; + split->bi_opf |= REQ_NOMERGE; bio_chain(split, *bio); trace_block_split(q, split, (*bio)->bi_iter.bi_sector); @@ -616,9 +616,9 @@ void blk_rq_set_mixed_merge(struct request *rq) * Distributes the attributs to each bio. */ for (bio = rq->bio; bio; bio = bio->bi_next) { - WARN_ON_ONCE((bio->bi_rw & REQ_FAILFAST_MASK) && - (bio->bi_rw & REQ_FAILFAST_MASK) != ff); - bio->bi_rw |= ff; + WARN_ON_ONCE((bio->bi_opf & REQ_FAILFAST_MASK) && + (bio->bi_opf & REQ_FAILFAST_MASK) != ff); + bio->bi_opf |= ff; } rq->cmd_flags |= REQ_MIXED_MERGE; } |