---

yaml --- r: 210520 b: refs/heads/master c: 72f4650 h: refs/heads/master v: v3
git-mirror · Aug 23, 2010 · 0cbd51c · 0cbd51c
1 parent c4e4077
commit 0cbd51c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e00d1b5b4c10fb839afd5ce61db8e24339454b0
+refs/heads/master: 72f465033702ebfe20db8f50edaad59f0f38b0f5
diff --git a/trunk/fs/bio-integrity.c b/trunk/fs/bio-integrity.c
@@ -413,7 +413,7 @@ int bio_integrity_prep(struct bio *bio)
 
 	/* Allocate kernel buffer for protection data */
 	len = sectors * blk_integrity_tuple_size(bi);
-	buf = kmalloc(len, GFP_NOIO | __GFP_NOFAIL | q->bounce_gfp);
+	buf = kmalloc(len, GFP_NOIO | q->bounce_gfp);
 	if (unlikely(buf == NULL)) {
 		printk(KERN_ERR "could not allocate integrity buffer\n");
 		return -EIO;