block, drivers, fs: rename REQ_FLUSH to REQ_PREFLUSH

To avoid confusion between REQ_OP_FLUSH, which is handled by
request_fn drivers, and upper layers requesting the block layer
perform a flush sequence along with possibly a WRITE, this patch
renames REQ_FLUSH to REQ_PREFLUSH.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

5 files changed, 6 insertions, 6 deletions

diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index f236a31cc095..d524973f94b3 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -148,7 +148,7 @@ static int _drbd_md_sync_page_io(struct drbd_device *device,
         device->md_io.error = -ENODEV;
 
         if ((op == REQ_OP_WRITE) && !test_bit(MD_NO_FUA, &device->flags))
-                op_flags |= REQ_FUA | REQ_FLUSH;
+                op_flags |= REQ_FUA | REQ_PREFLUSH;
         op_flags |= REQ_SYNC | REQ_NOIDLE;
 
         bio = bio_alloc_drbd(GFP_NOIO);
@@ -847,7 +847,7 @@ int __drbd_change_sync(struct drbd_device *device, sector_t sector, int size,
         unsigned long count = 0;
         sector_t esector, nr_sectors;
 
-        /* This would be an empty REQ_FLUSH, be silent. */
+        /* This would be an empty REQ_PREFLUSH, be silent. */
         if ((mode == SET_OUT_OF_SYNC) && size == 0)
                 return 0;
 
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index d55febcaa414..2b37744db0fa 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1609,7 +1609,7 @@ static u32 bio_flags_to_wire(struct drbd_connection *connection,
         if (connection->agreed_pro_version >= 95)
                 return  (bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0) |
                         (bio->bi_rw & REQ_FUA ? DP_FUA : 0) |
-                        (bio->bi_rw & REQ_FLUSH ? DP_FLUSH : 0) |
+                        (bio->bi_rw & REQ_PREFLUSH ? DP_FLUSH : 0) |
                         (bio_op(bio) == REQ_OP_DISCARD ? DP_DISCARD : 0);
         else
                 return bio->bi_rw & REQ_SYNC ? DP_RW_SYNC : 0;
diff --git a/drivers/block/drbd/drbd_protocol.h b/drivers/block/drbd/drbd_protocol.h
index ef9245363dcc..129f8c76c9b1 100644
--- a/drivers/block/drbd/drbd_protocol.h
+++ b/drivers/block/drbd/drbd_protocol.h
@@ -112,7 +112,7 @@ struct p_header100 {
 #define DP_MAY_SET_IN_SYNC    4
 #define DP_UNPLUG             8 /* not used anymore   */
 #define DP_FUA               16 /* equals REQ_FUA     */
-#define DP_FLUSH             32 /* equals REQ_FLUSH   */
+#define DP_FLUSH             32 /* equals REQ_PREFLUSH   */
 #define DP_DISCARD           64 /* equals REQ_DISCARD */
 #define DP_SEND_RECEIVE_ACK 128 /* This is a proto B write request */
 #define DP_SEND_WRITE_ACK   256 /* This is a proto C write request */
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 6c5997894475..1ee002352ea2 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -2158,7 +2158,7 @@ static unsigned long wire_flags_to_bio_flags(u32 dpf)
 {
         return  (dpf & DP_RW_SYNC ? REQ_SYNC : 0) |
                 (dpf & DP_FUA ? REQ_FUA : 0) |
-                (dpf & DP_FLUSH ? REQ_FLUSH : 0);
+                (dpf & DP_FLUSH ? REQ_PREFLUSH : 0);
 }
 
 static unsigned long wire_flags_to_bio_op(u32 dpf)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 2255dcfebd2b..eef6e9575b4e 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1132,7 +1132,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_FLUSH);
+                D_ASSERT(device, req->master_bio->bi_rw & REQ_PREFLUSH);
                 if (remote)
                         _req_mod(req, QUEUE_AS_DRBD_BARRIER);
                 return remote;