aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWang Shilong <wangsl-fnst@cn.fujitsu.com>2013-01-12 01:22:33 -0800
committerJan Kara <jack@suse.cz>2013-01-21 11:19:56 +0100
commit61f43e6880dee5983999fe40bf96c1cf43740b4c (patch)
tree95ac823e8e7518a8e6fac3a0e2bae4a91a5d6b05 /fs
parent8d8759eb488f9e88fa5f976c4fd7ed205661c872 (diff)
downloadlinux-61f43e6880dee5983999fe40bf96c1cf43740b4c.tar.gz
Ext3: add necessary check in case IO error happens
As we know io error may happen when the function 'sb_getblk' is called.Add necessary check for it The patch also fix a coding style problem. Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/inode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index b176d425354..6e4f8a529fb 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -676,6 +676,10 @@ static int ext3_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 = -ENOMEM;
+ goto failed;
+ }
branch[n].bh = bh;
lock_buffer(bh);
BUFFER_TRACE(bh, "call get_create_access");
@@ -717,7 +721,7 @@ failed:
BUFFER_TRACE(branch[i].bh, "call journal_forget");
ext3_journal_forget(handle, branch[i].bh);
}
- for (i = 0; i <indirect_blks; i++)
+ for (i = 0; i < indirect_blks; i++)
ext3_free_blocks(handle, inode, new_blocks[i], 1);
ext3_free_blocks(handle, inode, new_blocks[i], num);