]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
block: biovec_slab vs. CONFIG_BLK_DEV_INTEGRITY
authorMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Mar 2011 07:28:01 +0000 (08:28 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 8 Mar 2011 07:28:01 +0000 (08:28 +0100)
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>
fs/bio.c
include/linux/bio.h

index 4bd454fa844e3efc8c44755c7ea9847477f813ff..5694b756ed019a756c1f25a924fca58b94407b12 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -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,
index 35dcdb3589bc9a59047a58e166efc540c22a3105..ce33e6868a2f57116ae76510f4dc5de183c2b8fd 100644 (file)
@@ -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.