block: Remove code handling bio_alloc failure with __GFP_WAIT
authorNikanth Karthikesan <knikanth@suse.de>
Wed, 15 Apr 2009 05:05:31 +0000 (10:35 +0530)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 15 Apr 2009 10:10:12 +0000 (12:10 +0200)
Remove code handling bio_alloc failure with __GFP_WAIT.
GFP_KERNEL implies __GFP_WAIT.

Signed-off-by: Nikanth Karthikesan <knikanth@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-barrier.c
block/ioctl.c

index f7dae57e6cabdcfaaed15762c4d2b7b9889e6c77..20b4111fa0507a46a641faa295124afeaf5f4ea5 100644 (file)
@@ -319,9 +319,6 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
                return -ENXIO;
 
        bio = bio_alloc(GFP_KERNEL, 0);
-       if (!bio)
-               return -ENOMEM;
-
        bio->bi_end_io = bio_end_empty_barrier;
        bio->bi_private = &wait;
        bio->bi_bdev = bdev;
index 0f22e629b13c8e93bf46401c0913605b5d2cbfba..ad474d4bbccee0232303c24ae381ade156ae44aa 100644 (file)
@@ -146,8 +146,6 @@ static int blk_ioctl_discard(struct block_device *bdev, uint64_t start,
                struct bio *bio;
 
                bio = bio_alloc(GFP_KERNEL, 0);
-               if (!bio)
-                       return -ENOMEM;
 
                bio->bi_end_io = blk_ioc_discard_endio;
                bio->bi_bdev = bdev;