block: memory allocations in bounce_clone_bio must not fail

[linux-2.6-block.git] / block / bounce.c

diff --git a/block/bounce.c b/block/bounce.c
index 417faaac36b691b6f7f9205a72cdecf27335882a..87983a35079c22b821e7aa21bf2a1a3b5a75164b 100644 (file)
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -242,12 +242,11 @@ static struct bio *bounce_clone_bio(struct bio *bio_src)
         *    __bio_clone_fast() anyways.
         */
        if (bio_is_passthrough(bio_src))
-               bio = bio_kmalloc(GFP_NOIO, bio_segments(bio_src));
+               bio = bio_kmalloc(GFP_NOIO | __GFP_NOFAIL,
+                                 bio_segments(bio_src));
        else
                bio = bio_alloc_bioset(GFP_NOIO, bio_segments(bio_src),
                                       &bounce_bio_set);
-       if (!bio)
-               return NULL;
        bio->bi_bdev            = bio_src->bi_bdev;
        if (bio_flagged(bio_src, BIO_REMAPPED))
                bio_set_flag(bio, BIO_REMAPPED);