block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Martin K. Petersen and committed by

Jens Axboe 15 years ago df677140 de701c74

+1 -4

2 changed files

expand all

bio.c

include

linux

bio.h

+1 -3

fs/bio.c

··· 43 43 * unsigned short 44 44 */ 45 45 #define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) } 46 - struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = { 46 + static struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = { 47 47 BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES), 48 48 }; 49 49 #undef BV ··· 1656 1656 int size; 1657 1657 struct biovec_slab *bvs = bvec_slabs + i; 1658 1658 1659 - #ifndef CONFIG_BLK_DEV_INTEGRITY 1660 1659 if (bvs->nr_vecs <= BIO_INLINE_VECS) { 1661 1660 bvs->slab = NULL; 1662 1661 continue; 1663 1662 } 1664 - #endif 1665 1663 1666 1664 size = bvs->nr_vecs * sizeof(struct bio_vec); 1667 1665 bvs->slab = kmem_cache_create(bvs->name, size, 0,

-1

include/linux/bio.h

··· 304 304 }; 305 305 306 306 extern struct bio_set *fs_bio_set; 307 - extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; 308 307 309 308 /* 310 309 * a small number of entries is fine, not going to be performance critical.