From 54b844a6c4ee5692fb1d7115a435f69fb3030599 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 6 Jun 2013 10:18:22 -0400
Subject: [PATCH] --- yaml --- r: 377607 b: refs/heads/master c:
 a1d8d9a757cd46e044a3f6061c315eda14bf697e h: refs/heads/master i:   377605:
 f2fc5de9288a18804908dc681bc4fbb225d56004   377603:
 b465319113f00596e303ffdd580b7b54cd846e56   377599:
 6bf9df42cc4d2ac52d78a067ba15a817e3c94d8b v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/page-io.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2dc301e7bebe..c12fc3ca9b5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dc23bdd5f846ef868e82f789dfd9b13093f9ba6
+refs/heads/master: a1d8d9a757cd46e044a3f6061c315eda14bf697e
diff --git a/trunk/fs/ext4/page-io.c b/trunk/fs/ext4/page-io.c
index ce8c15a7eabc..48786cdb5e6c 100644
--- a/trunk/fs/ext4/page-io.c
+++ b/trunk/fs/ext4/page-io.c
@@ -372,6 +372,8 @@ static int io_submit_init_bio(struct ext4_io_submit *io,
 	struct bio *bio;
 
 	bio = bio_alloc(GFP_NOIO, min(nvecs, BIO_MAX_PAGES));
+	if (!bio)
+		return -ENOMEM;
 	bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9);
 	bio->bi_bdev = bh->b_bdev;
 	bio->bi_end_io = ext4_end_bio;