---

yaml --- r: 143339 b: refs/heads/master c: 15afd1c h: refs/heads/master i: 143337: ec2975b 143335: 237b2f2 v: v3
git-mirror · Apr 15, 2009 · 77d2405 · 77d2405
1 parent 7e5d678
commit 77d2405
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c824b9434e764d01489688e4e38aee43b93fcf
+refs/heads/master: 15afd1cc7b624e1c94fdf824ec5af611050b150c
diff --git a/trunk/block/blk-barrier.c b/trunk/block/blk-barrier.c
@@ -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;

diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
@@ -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;