Ext2: free memory allocated and forget buffer head when io error happens
Add a necessary check when an io error happens. If io error happens,free the memory allocated and forget buffer head. Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
f56426ae4d
commit
8d8759eb48
|
@ -495,6 +495,10 @@ static int ext2_alloc_branch(struct inode *inode,
|
||||||
* parent to disk.
|
* parent to disk.
|
||||||
*/
|
*/
|
||||||
bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
|
bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
|
||||||
|
if (unlikely(!bh)) {
|
||||||
|
err = -ENOMEM;
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
branch[n].bh = bh;
|
branch[n].bh = bh;
|
||||||
lock_buffer(bh);
|
lock_buffer(bh);
|
||||||
memset(bh->b_data, 0, blocksize);
|
memset(bh->b_data, 0, blocksize);
|
||||||
|
@ -523,6 +527,14 @@ static int ext2_alloc_branch(struct inode *inode,
|
||||||
}
|
}
|
||||||
*blks = num;
|
*blks = num;
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
failed:
|
||||||
|
for (i = 1; i < n; i++)
|
||||||
|
bforget(branch[i].bh);
|
||||||
|
for (i = 0; i < indirect_blks; i++)
|
||||||
|
ext2_free_blocks(inode, new_blocks[i], 1);
|
||||||
|
ext2_free_blocks(inode, new_blocks[i], num);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue