Commit 3bdec30f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Li Nan
Browse files

block: move struct biovec_slab to bio.c 

mainline inclusion
from mainline-v5.12-rc1
commit 6ac0b715
bugzilla: https://gitee.com/openeuler/kernel/issues/IB7FJU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6ac0b71537e1c14e7532408fe4aae553aa314237



--------------------------------

struct biovec_slab is only used inside of bio.c, so move it there.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens 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 dde4fe56 ("kabi: Add kabi reservation for storage module") add
kabi reservation in bio_set.]
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent f91cd54d

block/bio.c

+6 −0
Original line number Diff line number Diff line
@@ -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

include/linux/bio.h

+0 −6
Original line number Diff line number Diff line
@@ -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;