From 8ac1e8216f35b7f929c4bc3c31531b0d05cfcc01 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 5 Dec 2008 16:10:29 +0100
Subject: [PATCH] --- yaml --- r: 135567 b: refs/heads/master c:
 a7fcd37cdcb47806fb8a9070f006ee34061defa6 h: refs/heads/master i:   135565:
 255bdd10ff760b444d284797c12d671887528c51   135563:
 5aff36e4e36a76fb14b8efe3f8987e3986bbc735   135559:
 1986b610d31170bbcce117190fe00c35ab2f4b9a   135551:
 77840239fc4f12606273c3bb4af021d3ac2f0570 v: v3

---
 [refs]         | 2 +-
 trunk/fs/bio.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc3f60096a3d..3705f1778727 100644
--- 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
index cef6258b8943..9cc1430b4495 100644
--- 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);