aboutsummaryrefslogtreecommitdiff
path: root/fs/bio-integrity.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-08-23 13:35:09 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-23 13:36:58 +0200
commit72f465033702ebfe20db8f50edaad59f0f38b0f5 (patch)
tree34c65345dbc40568414c5ff7317bccb655766455 /fs/bio-integrity.c
parent5e00d1b5b4c10fb839afd5ce61db8e24339454b0 (diff)
downloadlinux-72f465033702ebfe20db8f50edaad59f0f38b0f5.tar.gz
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>
Diffstat (limited to 'fs/bio-integrity.c')
-rw-r--r--fs/bio-integrity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c
index 612a5c38d3c..a8f4cc67998 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;