From: David Rientjes <rientjes@google.com>
Date: Mon, 23 Aug 2010 11:35:09 +0000 (+0200)
Subject: bio-integrity.c: remove dependency on __GFP_NOFAIL
X-Git-Tag: upstream/snapshot3+hdmi~13026^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72f465033702ebfe20db8f50edaad59f0f38b0f5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

bio-integrity.c: remove dependency on __GFP_NOFAIL

The kmalloc() in bio_integrity_prep() is failable, so remove __GFP_NOFAIL
from its mask.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 612a5c3..a8f4cc6 100644
--- a/fs/bio-integrity.c
+++ b/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;