diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-10-27 21:30:11 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 21:30:11 -0400 |
commit | 877836905da55e8f2426234f42a89287184949e9 (patch) | |
tree | eecb60e9b55daaf794a3083f9c48fc94e05d4cd2 /fs/ext4/mballoc.c | |
parent | bd2d0210cf22f2bd0cef72eb97cf94fc7d31d8cc (diff) |
ext4: Check return value of sb_getblk() and friends
Fail block allocation if sb_getblk() returns NULL. In that case,
sb_find_get_block() also likely to fail so that it should skip
calling ext4_forget().
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/mballoc.c')
-rw-r--r-- | fs/ext4/mballoc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d732ef5a835d..611c866ef3fe 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -4537,6 +4537,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, | |||
4537 | if (!bh) | 4537 | if (!bh) |
4538 | tbh = sb_find_get_block(inode->i_sb, | 4538 | tbh = sb_find_get_block(inode->i_sb, |
4539 | block + i); | 4539 | block + i); |
4540 | if (unlikely(!tbh)) | ||
4541 | continue; | ||
4540 | ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, | 4542 | ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, |
4541 | inode, tbh, block + i); | 4543 | inode, tbh, block + i); |
4542 | } | 4544 | } |