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

[linux-block.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index d6ad3abc6ecaaaa945409190616af9c43786f1ef..624c03c8fe64e37f4ff742b27a1d1fa2d2588c39 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -72,9 +72,10 @@ struct blkcg_gq {
        struct blkg_iostat_set          iostat;
 
        struct blkg_policy_data         *pd[BLKCG_MAX_POLS];
-
+#ifdef CONFIG_BLK_CGROUP_PUNT_BIO
        spinlock_t                      async_bio_lock;
        struct bio_list                 async_bios;
+#endif
        union {
                struct work_struct      async_bio_work;
                struct work_struct      free_work;
@@ -375,16 +376,6 @@ static inline void blkg_put(struct blkcg_gq *blkg)
                if (((d_blkg) = blkg_lookup(css_to_blkcg(pos_css),      \
                                            (p_blkg)->q)))
 
-bool __blkcg_punt_bio_submit(struct bio *bio);
-
-static inline bool blkcg_punt_bio_submit(struct bio *bio)
-{
-       if (bio->bi_opf & REQ_CGROUP_PUNT)
-               return __blkcg_punt_bio_submit(bio);
-       else
-               return false;
-}
-
 static inline void blkcg_bio_issue_init(struct bio *bio)
 {
        bio_issue_init(&bio->bi_issue, bio_sectors(bio));
@@ -506,8 +497,6 @@ static inline struct blkcg_gq *pd_to_blkg(struct blkg_policy_data *pd) { return
 static inline char *blkg_path(struct blkcg_gq *blkg) { return NULL; }
 static inline void blkg_get(struct blkcg_gq *blkg) { }
 static inline void blkg_put(struct blkcg_gq *blkg) { }
-
-static inline bool blkcg_punt_bio_submit(struct bio *bio) { return false; }
 static inline void blkcg_bio_issue_init(struct bio *bio) { }
 static inline void blk_cgroup_bio_start(struct bio *bio) { }
 static inline bool blk_cgroup_mergeable(struct request *rq, struct bio *bio) { return true; }