Commit 72f46503 authored Aug 23, 2010 by David Rientjes Committed by Jens Axboe Aug 23, 2010

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>

parent 5e00d1b5

fs/bio-integrity.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message