Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit df677140281beb608f6748c341af7612f7bfe7a0

Authored by Martin K. Petersen
Committed by Jens Axboe
1 parent de701c74a3
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 1 additions and 4 deletions Side-by-side Diff

... ... @@ -43,7 +43,7 @@
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
50 50  
... ... @@ -1656,12 +1656,10 @@
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,
... ... @@ -304,7 +304,6 @@
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.