Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51d654e1 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Globalize bio_set and bio_vec_slab 



Move struct bio_set and biovec_slab definitions to bio.h so they can
be used outside of bio.c.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent a144ff09

fs/bio.c

+2 −28
Original line number Original line Diff line number Diff line
@@ -28,25 +28,10 @@ 
#include <linux/blktrace_api.h>

#include <linux/blktrace_api.h>

#include <scsi/sg.h>		/* for struct sg_iovec */

#include <scsi/sg.h>		/* for struct sg_iovec */





#define BIO_POOL_SIZE 2



static struct kmem_cache *bio_slab __read_mostly;

static struct kmem_cache *bio_slab __read_mostly;





#define BIOVEC_NR_POOLS 6



/*

 * a small number of entries is fine, not going to be performance critical.

 * basically we just need to survive

 */

#define BIO_SPLIT_ENTRIES 2

mempool_t *bio_split_pool __read_mostly;

mempool_t *bio_split_pool __read_mostly;





struct biovec_slab {

	int nr_vecs;

	char *name; 

	struct kmem_cache *slab;

};



/*

/*

 * if you change this list, also change bvec_alloc or things will

 * if you change this list, also change bvec_alloc or things will

 * break badly! cannot be bigger than what you can fit into an

 * break badly! cannot be bigger than what you can fit into an
@@ -59,24 +44,13 @@ static struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = { 
};

};

#undef BV

#undef BV





/*

 * bio_set is used to allow other portions of the IO system to

 * allocate their own private memory pools for bio and iovec structures.

 * These memory pools in turn all allocate from the bio_slab

 * and the bvec_slabs[].

 */

struct bio_set {

	mempool_t *bio_pool;

	mempool_t *bvec_pools[BIOVEC_NR_POOLS];

};



/*

/*

 * fs_bio_set is the bio_set containing bio and iovec memory pools used by

 * fs_bio_set is the bio_set containing bio and iovec memory pools used by

 * IO code that does not need private memory pools.

 * IO code that does not need private memory pools.

 */

 */

static struct bio_set *fs_bio_set;

struct bio_set *fs_bio_set;





static inline struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx, struct bio_set *bs)

struct bio_vec *bvec_alloc_bs(gfp_t gfp_mask, int nr, unsigned long *idx, struct bio_set *bs)

{

{

	struct bio_vec *bvl;

	struct bio_vec *bvl;

include/linux/bio.h

+29 −0
Original line number Original line Diff line number Diff line
@@ -333,6 +333,35 @@ extern struct bio *bio_copy_user_iov(struct request_queue *, struct sg_iovec *, 
				     int, int);

				     int, int);

extern int bio_uncopy_user(struct bio *);

extern int bio_uncopy_user(struct bio *);

void zero_fill_bio(struct bio *bio);

void zero_fill_bio(struct bio *bio);

extern struct bio_vec *bvec_alloc_bs(gfp_t, int, unsigned long *, struct bio_set *);



/*

 * bio_set is used to allow other portions of the IO system to

 * allocate their own private memory pools for bio and iovec structures.

 * These memory pools in turn all allocate from the bio_slab

 * and the bvec_slabs[].

 */

#define BIO_POOL_SIZE 2

#define BIOVEC_NR_POOLS 6



struct bio_set {

	mempool_t *bio_pool;

	mempool_t *bvec_pools[BIOVEC_NR_POOLS];

};



struct biovec_slab {

	int nr_vecs;

	char *name;

	struct kmem_cache *slab;

};



extern struct bio_set *fs_bio_set;



/*

 * a small number of entries is fine, not going to be performance critical.

 * basically we just need to survive

 */

#define BIO_SPLIT_ENTRIES 2





#ifdef CONFIG_HIGHMEM

#ifdef CONFIG_HIGHMEM

/*

/*