Commit 15afd1cc authored Apr 15, 2009 by Nikanth Karthikesan Committed by Jens Axboe Apr 15, 2009

block: Remove code handling bio_alloc failure with __GFP_WAIT



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>

parent 86c824b9

block/blk-barrier.c

+0 −3

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

block/ioctl.c

+0 −2

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