Merge tag 'for-5.18/write-streams-2022-03-18' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / include / linux / blk_types.h

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index ba8cfa5..dd0763a 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -323,7 +323,8 @@ enum {
        BIO_TRACE_COMPLETION,   /* bio_endio() should trace the final completion
                                 * of this bio. */
        BIO_CGROUP_ACCT,        /* has been accounted to a cgroup */
-       BIO_TRACKED,            /* set if bio goes through the rq_qos path */
+       BIO_QOS_THROTTLED,      /* bio went through rq_qos throttle path */
+       BIO_QOS_MERGED,         /* but went through rq_qos merge path */
        BIO_REMAPPED,
        BIO_ZONE_WRITE_LOCKED,  /* Owns a zoned device zone write lock */
        BIO_PERCPU_CACHE,       /* can participate in per-cpu alloc cache */
@@ -360,8 +361,6 @@ enum req_opf {
        REQ_OP_DISCARD          = 3,
        /* securely erase sectors */
        REQ_OP_SECURE_ERASE     = 5,
-       /* write the same sector many times */
-       REQ_OP_WRITE_SAME       = 7,
        /* write the zero filled sector many times */
        REQ_OP_WRITE_ZEROES     = 9,
        /* Open a zone */