Merge branch 'linus' into locking/urgent, to pick up fixes

[cascardo/linux.git] / drivers / block / drbd / drbd_req.c

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 66b8e4b..de279fe 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -288,7 +288,7 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m)
         */
        if (!ok &&
            bio_op(req->master_bio) == REQ_OP_READ &&
-           !(req->master_bio->bi_rw & REQ_RAHEAD) &&
+           !(req->master_bio->bi_opf & REQ_RAHEAD) &&
            !list_empty(&req->tl_requests))
                req->rq_state |= RQ_POSTPONED;
 
@@ -1137,7 +1137,7 @@ static int drbd_process_write_request(struct drbd_request *req)
         * replicating, in which case there is no point. */
        if (unlikely(req->i.size == 0)) {
                /* The only size==0 bios we expect are empty flushes. */
-               D_ASSERT(device, req->master_bio->bi_rw & REQ_PREFLUSH);
+               D_ASSERT(device, req->master_bio->bi_opf & REQ_PREFLUSH);
                if (remote)
                        _req_mod(req, QUEUE_AS_DRBD_BARRIER);
                return remote;
@@ -1176,7 +1176,7 @@ drbd_submit_req_private_bio(struct drbd_request *req)
 
        if (bio_op(bio) != REQ_OP_READ)
                type = DRBD_FAULT_DT_WR;
-       else if (bio->bi_rw & REQ_RAHEAD)
+       else if (bio->bi_opf & REQ_RAHEAD)
                type = DRBD_FAULT_DT_RA;
        else
                type = DRBD_FAULT_DT_RD;