Merge tag 'for-6.4/block-2023-04-21' of git://git.kernel.dk/linux

[linux-block.git] / include / linux / blk_types.h

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 3e8e9a97de462e06acad28cb070832752aa1793a..740afe80f297868e563fb53c861b08f58b7c511e 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -409,18 +409,11 @@ enum req_flag_bits {
        __REQ_RAHEAD,           /* read ahead, can fail anytime */
        __REQ_BACKGROUND,       /* background IO */
        __REQ_NOWAIT,           /* Don't wait if request will block */
-       /*
-        * When a shared kthread needs to issue a bio for a cgroup, doing
-        * so synchronously can lead to priority inversions as the kthread
-        * can be trapped waiting for that cgroup.  CGROUP_PUNT flag makes
-        * submit_bio() punt the actual issuing to a dedicated per-blkcg
-        * work item to avoid such priority inversions.
-        */
-       __REQ_CGROUP_PUNT,
        __REQ_POLLED,           /* caller polls for completion using bio_poll */
        __REQ_ALLOC_CACHE,      /* allocate IO from cache if available */
        __REQ_SWAP,             /* swap I/O */
        __REQ_DRV,              /* for driver use */
+       __REQ_FS_PRIVATE,       /* for file system (submitter) use */
 
        /*
         * Command specific flags, keep last:
@@ -448,14 +441,13 @@ enum req_flag_bits {
 #define REQ_RAHEAD     (__force blk_opf_t)(1ULL << __REQ_RAHEAD)
 #define REQ_BACKGROUND (__force blk_opf_t)(1ULL << __REQ_BACKGROUND)
 #define REQ_NOWAIT     (__force blk_opf_t)(1ULL << __REQ_NOWAIT)
-#define REQ_CGROUP_PUNT        (__force blk_opf_t)(1ULL << __REQ_CGROUP_PUNT)
-
-#define REQ_NOUNMAP    (__force blk_opf_t)(1ULL << __REQ_NOUNMAP)
 #define REQ_POLLED     (__force blk_opf_t)(1ULL << __REQ_POLLED)
 #define REQ_ALLOC_CACHE        (__force blk_opf_t)(1ULL << __REQ_ALLOC_CACHE)
-
-#define REQ_DRV                (__force blk_opf_t)(1ULL << __REQ_DRV)
 #define REQ_SWAP       (__force blk_opf_t)(1ULL << __REQ_SWAP)
+#define REQ_DRV                (__force blk_opf_t)(1ULL << __REQ_DRV)
+#define REQ_FS_PRIVATE (__force blk_opf_t)(1ULL << __REQ_FS_PRIVATE)
+
+#define REQ_NOUNMAP    (__force blk_opf_t)(1ULL << __REQ_NOUNMAP)
 
 #define REQ_FAILFAST_MASK \
        (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)