Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 72f465033702ebfe20db8f50edaad59f0f38b0f5

Authored by David Rientjes
Committed by Jens Axboe
1 parent 5e00d1b5b4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -413,7 +413,7 @@
413 413  
414 414 /* Allocate kernel buffer for protection data */
415 415 len = sectors * blk_integrity_tuple_size(bi);
416   - buf = kmalloc(len, GFP_NOIO | __GFP_NOFAIL | q->bounce_gfp);
  416 + buf = kmalloc(len, GFP_NOIO | q->bounce_gfp);
417 417 if (unlikely(buf == NULL)) {
418 418 printk(KERN_ERR "could not allocate integrity buffer\n");
419 419 return -EIO;