Commit 72f46503 authored by David Rientjes's avatar David Rientjes Committed by Jens Axboe

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: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 5e00d1b5
...@@ -413,7 +413,7 @@ int bio_integrity_prep(struct bio *bio) ...@@ -413,7 +413,7 @@ int bio_integrity_prep(struct bio *bio)
/* Allocate kernel buffer for protection data */ /* Allocate kernel buffer for protection data */
len = sectors * blk_integrity_tuple_size(bi); 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)) { if (unlikely(buf == NULL)) {
printk(KERN_ERR "could not allocate integrity buffer\n"); printk(KERN_ERR "could not allocate integrity buffer\n");
return -EIO; return -EIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment