| Message ID | 1287476529-5314-1-git-send-email-namhyung@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, Oct 19, 2010 at 05:22:09PM +0900, Namhyung Kim wrote: > 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> Thanks, I've added this patch to the ext4 patch queue. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 4b8debe..12c0310 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -755,6 +755,11 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode, * parent to disk. */ bh = sb_getblk(inode->i_sb, new_blocks[n-1]); + if (unlikely(!bh)) { + err = -EIO; + goto failed; + } + branch[n].bh = bh; lock_buffer(bh); BUFFER_TRACE(bh, "call get_create_access"); diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4b4ad4b..48f5d10 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4531,6 +4531,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, if (!bh) tbh = sb_find_get_block(inode->i_sb, block + i); + if (unlikely(!tbh)) + continue; ext4_forget(handle, flags & EXT4_FREE_BLOCKS_METADATA, inode, tbh, block + i); }
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> --- fs/ext4/inode.c | 5 +++++ fs/ext4/mballoc.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)