aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-11-18 19:43:46 -0700
committerJens Axboe <axboe@fb.com>2014-11-18 19:43:46 -0700
commitb3521729769ec71567a2e32a38609f87e781e41b (patch)
tree66a8494968706420c3eb043caa5868702d440d18 /fs/ext4/ialloc.c
parentNVMe: enable IO stats by default (diff)
parentLinux 3.18-rc5 (diff)
downloadlinux-dev-b3521729769ec71567a2e32a38609f87e781e41b.tar.xz
linux-dev-b3521729769ec71567a2e32a38609f87e781e41b.zip
Merge branch 'master' into for-3.19/drivers
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 8012a5daf401..ac644c31ca67 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -887,6 +887,10 @@ got:
struct buffer_head *block_bitmap_bh;
block_bitmap_bh = ext4_read_block_bitmap(sb, group);
+ if (!block_bitmap_bh) {
+ err = -EIO;
+ goto out;
+ }
BUFFER_TRACE(block_bitmap_bh, "get block bitmap access");
err = ext4_journal_get_write_access(handle, block_bitmap_bh);
if (err) {