summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/pmem.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-08-05 17:35:16 -0400
committerJens Axboe <axboe@fb.com>2016-08-07 16:41:02 -0400
commit1eff9d322a444245c67515edb52bc0eb68374aa8 (patch)
treeaed4c3bfdf94202b93b9b5ce74c6e247f4c3ab85 /drivers/nvdimm/pmem.c
parent31c64f78767948986c6c4c6f488803722c6b0e7a (diff)
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 'drivers/nvdimm/pmem.c')
-rw-r--r--drivers/nvdimm/pmem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 20bae50c231d..571a6c7ee2fc 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -128,7 +128,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
128 struct pmem_device *pmem = q->queuedata; 128 struct pmem_device *pmem = q->queuedata;
129 struct nd_region *nd_region = to_region(pmem); 129 struct nd_region *nd_region = to_region(pmem);
130 130
131 if (bio->bi_rw & REQ_FLUSH) 131 if (bio->bi_opf & REQ_FLUSH)
132 nvdimm_flush(nd_region); 132 nvdimm_flush(nd_region);
133 133
134 do_acct = nd_iostat_start(bio, &start); 134 do_acct = nd_iostat_start(bio, &start);
@@ -144,7 +144,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
144 if (do_acct) 144 if (do_acct)
145 nd_iostat_end(bio, start); 145 nd_iostat_end(bio, start);
146 146
147 if (bio->bi_rw & REQ_FUA) 147 if (bio->bi_opf & REQ_FUA)
148 nvdimm_flush(nd_region); 148 nvdimm_flush(nd_region);
149 149
150 bio_endio(bio); 150 bio_endio(bio);