Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 02:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY

Browse Source 
The block integrity subsystem no longer uses the bio_vec slabs so this
code can safely be compiled in.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Martin K. Petersen 2011-03-08 08:28:01 +01:00 committed by Jens Axboe
parent de701c74a3
commit df67714028
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/bio.c
View File

@ -43,7 +43,7 @@ static mempool_t *bio_split_pool __read_mostly;
* unsigned short * unsigned short
*/ */
#define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) } #define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) }
struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = { static struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = {
BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES), BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES),
}; };
#undef BV #undef BV
@ -1656,12 +1656,10 @@ static void __init biovec_init_slabs(void)
int size; int size;
struct biovec_slab *bvs = bvec_slabs + i; struct biovec_slab *bvs = bvec_slabs + i;
#ifndef CONFIG_BLK_DEV_INTEGRITY
if (bvs->nr_vecs <= BIO_INLINE_VECS) { if (bvs->nr_vecs <= BIO_INLINE_VECS) {
bvs->slab = NULL; bvs->slab = NULL;
continue; continue;
} }
#endif
size = bvs->nr_vecs * sizeof(struct bio_vec); size = bvs->nr_vecs * sizeof(struct bio_vec);
bvs->slab = kmem_cache_create(bvs->name, size, 0, bvs->slab = kmem_cache_create(bvs->name, size, 0,

1
include/linux/bio.h
View File

@ -304,7 +304,6 @@ struct biovec_slab {
}; };
extern struct bio_set *fs_bio_set; extern struct bio_set *fs_bio_set;
extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
/* /*
* a small number of entries is fine, not going to be performance critical. * a small number of entries is fine, not going to be performance critical.