block: reorganize QUEUE_ORDERED_* constants

Separate out ordering type (drain,) and action masks (preflush,
postflush, fua) from visible ordering mode selectors
(QUEUE_ORDERED_*).  Ordering types are now named QUEUE_ORDERED_BY_*
while action masks are named QUEUE_ORDERED_DO_*.

This change is necessary to add QUEUE_ORDERED_DO_BAR and make it
optional to improve empty barrier implementation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 23 insertions, 16 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e9bb73ff1d64..5c92b4432399 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -523,22 +523,29 @@ enum {
          * TAG_FLUSH    : ordering by tag w/ pre and post flushes
          * TAG_FUA      : ordering by tag w/ pre flush and FUA write
          */
-        QUEUE_ORDERED_NONE      = 0x00,
-        QUEUE_ORDERED_DRAIN     = 0x01,
-        QUEUE_ORDERED_TAG       = 0x02,
-
-        QUEUE_ORDERED_PREFLUSH  = 0x10,
-        QUEUE_ORDERED_POSTFLUSH = 0x20,
-        QUEUE_ORDERED_FUA       = 0x40,
-
-        QUEUE_ORDERED_DRAIN_FLUSH = QUEUE_ORDERED_DRAIN |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
-        QUEUE_ORDERED_DRAIN_FUA = QUEUE_ORDERED_DRAIN |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
-        QUEUE_ORDERED_TAG_FLUSH = QUEUE_ORDERED_TAG |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
-        QUEUE_ORDERED_TAG_FUA   = QUEUE_ORDERED_TAG |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
+        QUEUE_ORDERED_BY_DRAIN          = 0x01,
+        QUEUE_ORDERED_BY_TAG            = 0x02,
+        QUEUE_ORDERED_DO_PREFLUSH       = 0x10,
+        QUEUE_ORDERED_DO_POSTFLUSH      = 0x40,
+        QUEUE_ORDERED_DO_FUA            = 0x80,
+
+        QUEUE_ORDERED_NONE              = 0x00,
+
+        QUEUE_ORDERED_DRAIN             = QUEUE_ORDERED_BY_DRAIN,
+        QUEUE_ORDERED_DRAIN_FLUSH       = QUEUE_ORDERED_DRAIN |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_POSTFLUSH,
+        QUEUE_ORDERED_DRAIN_FUA         = QUEUE_ORDERED_DRAIN |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_FUA,
+
+        QUEUE_ORDERED_TAG               = QUEUE_ORDERED_BY_TAG,
+        QUEUE_ORDERED_TAG_FLUSH         = QUEUE_ORDERED_TAG |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_POSTFLUSH,
+        QUEUE_ORDERED_TAG_FUA           = QUEUE_ORDERED_TAG |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_FUA,
 
         /*
          * Ordered operation sequence