diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2011-03-08 08:28:01 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-08 08:28:01 +0100 |
| commit | df677140281beb608f6748c341af7612f7bfe7a0 (patch) | |
| tree | db977b703e36487ce956cc120bb021565810734f | |
| parent | de701c74a34005e637e1ca2634fbf28fd1debba2 (diff) | |
| download | kernel_samsung_espresso10-df677140281beb608f6748c341af7612f7bfe7a0.zip kernel_samsung_espresso10-df677140281beb608f6748c341af7612f7bfe7a0.tar.gz kernel_samsung_espresso10-df677140281beb608f6748c341af7612f7bfe7a0.tar.bz2 | |
block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY
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>
| -rw-r--r-- | fs/bio.c | 4 | ||||
| -rw-r--r-- | include/linux/bio.h | 1 |
2 files changed, 1 insertions, 4 deletions
@@ -43,7 +43,7 @@ static mempool_t *bio_split_pool __read_mostly; * unsigned short */ #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), }; #undef BV @@ -1656,12 +1656,10 @@ static void __init biovec_init_slabs(void) int size; struct biovec_slab *bvs = bvec_slabs + i; -#ifndef CONFIG_BLK_DEV_INTEGRITY if (bvs->nr_vecs <= BIO_INLINE_VECS) { bvs->slab = NULL; continue; } -#endif size = bvs->nr_vecs * sizeof(struct bio_vec); bvs->slab = kmem_cache_create(bvs->name, size, 0, diff --git a/include/linux/bio.h b/include/linux/bio.h index 35dcdb3..ce33e68 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -304,7 +304,6 @@ struct biovec_slab { }; 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. |