GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext3: Add error check in ext3_mkdir()

Browse source 
Check return value of ext3_journal_get_write_access, ext3_journal_dirty_metadata
and ext3_mark_inode_dirty. Consolidate error path under new label 'out_clear_inode'
and adjust bh releasing appropriately.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Namhyung Kim 2010-11-16 20:18:12 +09:00 • committed by Jan Kara
parent 99fbb1e2af
commit 2b543edae2
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
fs/ext3/namei.c
View file

@ -1762,7 +1762,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
{ {
handle_t *handle; handle_t *handle;
struct inode * inode; struct inode * inode;
struct buffer_head * dir_block; struct buffer_head * dir_block = NULL;
struct ext3_dir_entry_2 * de; struct ext3_dir_entry_2 * de;
int err, retries = 0; int err, retries = 0;
@ -1790,15 +1790,14 @@ retry:
inode->i_fop = &ext3_dir_operations; inode->i_fop = &ext3_dir_operations;
inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize; inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
dir_block = ext3_bread (handle, inode, 0, 1, &err); dir_block = ext3_bread (handle, inode, 0, 1, &err);
if (!dir_block) { if (!dir_block)
drop_nlink(inode); /* is this nlink == 0? */ goto out_clear_inode;
unlock_new_inode(inode);
ext3_mark_inode_dirty(handle, inode);
iput (inode);
goto out_stop;
}
BUFFER_TRACE(dir_block, "get_write_access"); BUFFER_TRACE(dir_block, "get_write_access");
ext3_journal_get_write_access(handle, dir_block); err = ext3_journal_get_write_access(handle, dir_block);
if (err)
goto out_clear_inode;
de = (struct ext3_dir_entry_2 *) dir_block->b_data; de = (struct ext3_dir_entry_2 *) dir_block->b_data;
de->inode = cpu_to_le32(inode->i_ino); de->inode = cpu_to_le32(inode->i_ino);
de->name_len = 1; de->name_len = 1;
@ -1814,11 +1813,16 @@ retry:
ext3_set_de_type(dir->i_sb, de, S_IFDIR); ext3_set_de_type(dir->i_sb, de, S_IFDIR);
inode->i_nlink = 2; inode->i_nlink = 2;
BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata"); BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
ext3_journal_dirty_metadata(handle, dir_block); err = ext3_journal_dirty_metadata(handle, dir_block);
brelse (dir_block); if (err)
ext3_mark_inode_dirty(handle, inode); goto out_clear_inode;
err = ext3_mark_inode_dirty(handle, inode);
if (!err)
err = ext3_add_entry (handle, dentry, inode); err = ext3_add_entry (handle, dentry, inode);
if (err) { if (err) {
out_clear_inode:
inode->i_nlink = 0; inode->i_nlink = 0;
unlock_new_inode(inode); unlock_new_inode(inode);
ext3_mark_inode_dirty(handle, inode); ext3_mark_inode_dirty(handle, inode);
@ -1827,10 +1831,14 @@ retry:
} }
inc_nlink(dir); inc_nlink(dir);
ext3_update_dx_flag(dir); ext3_update_dx_flag(dir);
ext3_mark_inode_dirty(handle, dir); err = ext3_mark_inode_dirty(handle, dir);
if (err)
goto out_clear_inode;
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
unlock_new_inode(inode); unlock_new_inode(inode);
out_stop: out_stop:
brelse(dir_block);
ext3_journal_stop(handle); ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry; goto retry;