aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2016-06-05 15:31:48 -0400
committerJens Axboe <axboe@fb.com>2016-06-07 15:41:38 -0400
commit95fe6c1a209ef89d9f94dd04a0ad72be1487d5d5 (patch)
tree4f0b5eabb7d38efe2f17e61207c628a1de8bb6ea /drivers/lightnvm
parentc8d93247f1d0cf478222a7f4fc37d453d6193d04 (diff)
block, fs, mm, drivers: use bio set/get op accessors
This patch converts the simple bi_rw use cases in the block, drivers, mm and fs code to set/get the bio operation using bio_set_op_attrs/bio_op These should be simple one or two liner cases, so I just did them in one patch. The next patches handle the more complicated cases in a module per patch. Signed-off-by: Mike Christie <mchristi@redhat.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
-rw-r--r--drivers/lightnvm/rrpc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index 2103e97a974f..de86d72dcdf0 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -342,7 +342,7 @@ try:
342 342
343 /* Perform read to do GC */ 343 /* Perform read to do GC */
344 bio->bi_iter.bi_sector = rrpc_get_sector(rev->addr); 344 bio->bi_iter.bi_sector = rrpc_get_sector(rev->addr);
345 bio->bi_rw = READ; 345 bio_set_op_attrs(bio, REQ_OP_READ, 0);
346 bio->bi_private = &wait; 346 bio->bi_private = &wait;
347 bio->bi_end_io = rrpc_end_sync_bio; 347 bio->bi_end_io = rrpc_end_sync_bio;
348 348
@@ -364,7 +364,7 @@ try:
364 reinit_completion(&wait); 364 reinit_completion(&wait);
365 365
366 bio->bi_iter.bi_sector = rrpc_get_sector(rev->addr); 366 bio->bi_iter.bi_sector = rrpc_get_sector(rev->addr);
367 bio->bi_rw = WRITE; 367 bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
368 bio->bi_private = &wait; 368 bio->bi_private = &wait;
369 bio->bi_end_io = rrpc_end_sync_bio; 369 bio->bi_end_io = rrpc_end_sync_bio;
370 370
@@ -908,7 +908,7 @@ static blk_qc_t rrpc_make_rq(struct request_queue *q, struct bio *bio)
908 struct nvm_rq *rqd; 908 struct nvm_rq *rqd;
909 int err; 909 int err;
910 910
911 if (bio->bi_rw & REQ_DISCARD) { 911 if (bio_op(bio) == REQ_OP_DISCARD) {
912 rrpc_discard(rrpc, bio); 912 rrpc_discard(rrpc, bio);
913 return BLK_QC_T_NONE; 913 return BLK_QC_T_NONE;
914 } 914 }