On Tue, 20 Jul 2010 19:45:00 -0700 (PDT) David Rientjes <rientjes@xxxxxxxxxx> wrote: > The kmalloc() in bio_integrity_prep() is failable, so remove __GFP_NOFAIL > from its mask. > > Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> > Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> > --- > fs/bio-integrity.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/bio-integrity.c b/fs/bio-integrity.c > --- 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; ^^^ what? -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html