From 0cbd51cd6811a73d001986f09f7a018c8b4806bc Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 23 Aug 2010 13:35:09 +0200
Subject: [PATCH] --- yaml --- r: 210520 b: refs/heads/master c:
 72f465033702ebfe20db8f50edaad59f0f38b0f5 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/bio-integrity.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d6253dc0cf6..e58d7537f0bc 100644
--- 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
index 612a5c38d3c1..a8f4cc679983 100644
--- 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;