1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index dff48701b84d..cba1deb7b271 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1180,7 +1180,7 @@ next_bio:
         bio->bi_sector = sector;
         bio->bi_bdev = mdev->ldev->backing_bdev;
         /* we special case some flags in the multi-bio case, see below
-         * (BIO_RW_UNPLUG, BIO_RW_BARRIER) */
+         * (REQ_UNPLUG, REQ_HARDBARRIER) */
         bio->bi_rw = rw;
         bio->bi_private = e;
         bio->bi_end_io = drbd_endio_sec;
@@ -1209,16 +1209,16 @@ next_bio:
                 bios = bios->bi_next;
                 bio->bi_next = NULL;
 
-                /* strip off BIO_RW_UNPLUG unless it is the last bio */
+                /* strip off REQ_UNPLUG unless it is the last bio */
                 if (bios)
-                        bio->bi_rw &= ~(1<<BIO_RW_UNPLUG);
+                        bio->bi_rw &= ~REQ_UNPLUG;
 
                 drbd_generic_make_request(mdev, fault_type, bio);
 
-                /* strip off BIO_RW_BARRIER,
+                /* strip off REQ_HARDBARRIER,
                  * unless it is the first or last bio */
                 if (bios && bios->bi_next)
-                        bios->bi_rw &= ~(1<<BIO_RW_BARRIER);
+                        bios->bi_rw &= ~REQ_HARDBARRIER;
         } while (bios);
         maybe_kick_lo(mdev);
         return 0;
@@ -1233,7 +1233,7 @@ fail:
 }
 
 /**
- * w_e_reissue() - Worker callback; Resubmit a bio, without BIO_RW_BARRIER set
+ * w_e_reissue() - Worker callback; Resubmit a bio, without REQ_HARDBARRIER set
  * @mdev:       DRBD device.
  * @w:          work object.
  * @cancel:     The connection will be closed anyways (unused in this callback)
@@ -1245,7 +1245,7 @@ int w_e_reissue(struct drbd_conf *mdev, struct drbd_work *w, int cancel) __relea
            (and DE_BARRIER_IN_NEXT_EPOCH_ISSUED in the previous Epoch)
            so that we can finish that epoch in drbd_may_finish_epoch().
            That is necessary if we already have a long chain of Epochs, before
-           we realize that BIO_RW_BARRIER is actually not supported */
+           we realize that REQ_HARDBARRIER is actually not supported */
 
         /* As long as the -ENOTSUPP on the barrier is reported immediately
            that will never trigger. If it is reported late, we will just
@@ -1824,14 +1824,14 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h)
                 epoch = list_entry(e->epoch->list.prev, struct drbd_epoch, list);
                 if (epoch == e->epoch) {
                         set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags);
-                        rw |= (1<<BIO_RW_BARRIER);
+                        rw |= REQ_HARDBARRIER;
                         e->flags |= EE_IS_BARRIER;
                 } else {
                         if (atomic_read(&epoch->epoch_size) > 1 ||
                             !test_bit(DE_CONTAINS_A_BARRIER, &epoch->flags)) {
                                 set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags);
                                 set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags);
-                                rw |= (1<<BIO_RW_BARRIER);
+                                rw |= REQ_HARDBARRIER;
                                 e->flags |= EE_IS_BARRIER;
                         }
                 }
@@ -1841,10 +1841,10 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h)
         dp_flags = be32_to_cpu(p->dp_flags);
         if (dp_flags & DP_HARDBARRIER) {
                 dev_err(DEV, "ASSERT FAILED would have submitted barrier request\n");
-                /* rw |= (1<<BIO_RW_BARRIER); */
+                /* rw |= REQ_HARDBARRIER; */
         }
         if (dp_flags & DP_RW_SYNC)
-                rw |= (1<<BIO_RW_SYNCIO) | (1<<BIO_RW_UNPLUG);
+                rw |= REQ_SYNC | REQ_UNPLUG;
         if (dp_flags & DP_MAY_SET_IN_SYNC)
                 e->flags |= EE_MAY_SET_IN_SYNC;