block: rename bio bi_rw to bi_opf

[karo-tx-linux.git] / drivers / md / dm-stripe.c

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 01bb9cf2a8c2318e1b5cf704728637acf95665c9..28193a57bf471e30da0bedd944fe148283584b9c 100644 (file)
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -286,7 +286,7 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
        uint32_t stripe;
        unsigned target_bio_nr;
 
-       if (bio->bi_rw & REQ_PREFLUSH) {
+       if (bio->bi_opf & REQ_PREFLUSH) {
                target_bio_nr = dm_bio_get_target_bio_nr(bio);
                BUG_ON(target_bio_nr >= sc->stripes);
                bio->bi_bdev = sc->stripe[target_bio_nr].dev->bdev;
@@ -309,7 +309,7 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
 }
 
 static long stripe_direct_access(struct dm_target *ti, sector_t sector,
-                                void __pmem **kaddr, pfn_t *pfn, long size)
+                                void **kaddr, pfn_t *pfn, long size)
 {
        struct stripe_c *sc = ti->private;
        uint32_t stripe;
@@ -383,7 +383,7 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
        if (!error)
                return 0; /* I/O complete */
 
-       if ((error == -EWOULDBLOCK) && (bio->bi_rw & REQ_RAHEAD))
+       if ((error == -EWOULDBLOCK) && (bio->bi_opf & REQ_RAHEAD))
                return error;
 
        if (error == -EOPNOTSUPP)