block: use generic u16 for write hints

This is still backwards compatible with lifetime hints. It just doesn't
constrain the hints to that definition. Using this type doesn't change
the size of either bio or request.

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 4fecf46ef681b357d83e7c64433e1035269fb50c..6545c77a81b3f00ecf9b62db8bf969b6faf3e7e4 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -8,7 +8,6 @@
 #include <linux/scatterlist.h>
 #include <linux/prefetch.h>
 #include <linux/srcu.h>
-#include <linux/rw_hint.h>
 
 struct blk_mq_tags;
 struct blk_flush_queue;
@@ -156,7 +155,7 @@ struct request {
        struct blk_crypto_keyslot *crypt_keyslot;
 #endif
 
-       enum rw_hint write_hint;
+       unsigned short write_hint;
        unsigned short ioprio;
 
        enum mq_rq_state state;

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index dce7615c35e7e34b4091b30f095b6b1655b0eb39..6737795220e18d0084c8aecbd71bd1a9ad1ed261 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -10,7 +10,6 @@
 #include <linux/bvec.h>
 #include <linux/device.h>
 #include <linux/ktime.h>
-#include <linux/rw_hint.h>
 
 struct bio_set;
 struct bio;
@@ -219,7 +218,7 @@ struct bio {
                                                 */
        unsigned short          bi_flags;       /* BIO_* below */
        unsigned short          bi_ioprio;
-       enum rw_hint            bi_write_hint;
+       unsigned short          bi_write_hint;
        blk_status_t            bi_status;
        atomic_t                __bi_remaining;