---

yaml --- r: 180165 b: refs/heads/master c: 9e9432c h: refs/heads/master i: 180163: a3a9a92 v: v3
git-mirror · Jan 30, 2010 · cca0b44 · cca0b44
1 parent 1f31a51
commit cca0b44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d6165851cd8e3f919d446cd6da35dee44e8837e
+refs/heads/master: 9e9432c267e4047db98b9d4fba95099c6effcef9
diff --git a/trunk/fs/bio-integrity.c b/trunk/fs/bio-integrity.c
@@ -61,7 +61,7 @@ static inline unsigned int vecs_to_idx(unsigned int nr)
 
 static inline int use_bip_pool(unsigned int idx)
 {
-	if (idx == BIOVEC_NR_POOLS)
+	if (idx == BIOVEC_MAX_IDX)
 		return 1;
 
 	return 0;
@@ -95,6 +95,7 @@ struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio,
 
 	/* Use mempool if lower order alloc failed or max vecs were requested */
 	if (bip == NULL) {
+		idx = BIOVEC_MAX_IDX;  /* so we free the payload properly later */
 		bip = mempool_alloc(bs->bio_integrity_pool, gfp_mask);
 
 		if (unlikely(bip == NULL)) {