From: Christoph Hellwig <hch@lst.de> mainline inclusion from mainline-v5.12-rc1 commit 6ac0b71537e1c14e7532408fe4aae553aa314237 bugzilla: https://gitee.com/openeuler/kernel/issues/IB7FJU Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... -------------------------------- struct biovec_slab is only used inside of bio.c, so move it there. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/bio.c include/linux/bio.h [Commit 82b10af05f7a ("[Huawei] blk-io-hierarchy: factor out a new struct bio_hierarchy_data from bio") add inclusion of "blk-io-hierarchy/stats.h"; commit dde4fe567523 ("kabi: Add kabi reservation for storage module") add kabi reservation in bio_set.] Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Signed-off-by: Li Nan <linan122@huawei.com> --- include/linux/bio.h | 6 ------ block/bio.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index e895c84be0bc..f385ebf4c342 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -706,12 +706,6 @@ struct bio_set { KABI_RESERVE(4) }; -struct biovec_slab { - int nr_vecs; - char *name; - struct kmem_cache *slab; -}; - static inline bool bioset_initialized(struct bio_set *bs) { return bs->bio_slab != NULL; diff --git a/block/bio.c b/block/bio.c index 26b30cd7be8c..83df5e983083 100644 --- a/block/bio.c +++ b/block/bio.c @@ -24,6 +24,12 @@ #include "blk.h" #include "blk-rq-qos.h" +struct biovec_slab { + int nr_vecs; + char *name; + struct kmem_cache *slab; +}; + /* * if you change this list, also change bvec_alloc or things will * break badly! cannot be bigger than what you can fit into an -- 2.39.2