From 77d2405b070a06ec5484dbe7916d52afc89c6d45 Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Wed, 15 Apr 2009 10:35:31 +0530
Subject: [PATCH] --- yaml --- r: 143339 b: refs/heads/master c:
 15afd1cc7b624e1c94fdf824ec5af611050b150c h: refs/heads/master i:   143337:
 ec2975b34e3fc745c932d8d33c7d37f0cfdbf43c   143335:
 237b2f2814c649af37699824a98cfd3d70932c3c v: v3

---
 [refs]                    | 2 +-
 trunk/block/blk-barrier.c | 3 ---
 trunk/block/ioctl.c       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f8d158ec14e6..b21902afbf43 100644
--- 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
index f7dae57e6cab..20b4111fa050 100644
--- 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
index 0f22e629b13c..ad474d4bbcce 100644
--- 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;