---

yaml --- r: 135567 b: refs/heads/master c: a7fcd37 h: refs/heads/master i: 135565: 255bdd1 135563: 5aff36e 135559: 1986b61 135551: 7784023 v: v3
git-mirror · Mar 24, 2009 · 8ac1e82 · 8ac1e82
1 parent ee13112
commit 8ac1e82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34053979fb1d923217685cf166349f1899980581
+refs/heads/master: a7fcd37cdcb47806fb8a9070f006ee34061defa6
diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c
@@ -1589,6 +1589,13 @@ 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,
                                 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);