[PATCH] Fix ext3_new_inode() failure paths
Fix failure paths in ext3_new_inode() and clean up duplicated code: - DQUOT_DROP() was not being called if ext3_init_security() failed. Signed-off-by: Chris Sykes <chris@sigsegv.plus.com> Cc: Stephen Smalley <sds@epoch.ncsc.mil> Cc: Jan Kara <jack@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9ed6c2fb34
commit
dc7b5fd6b0
|
@ -597,27 +597,22 @@ got:
|
|||
|
||||
ret = inode;
|
||||
if(DQUOT_ALLOC_INODE(inode)) {
|
||||
DQUOT_DROP(inode);
|
||||
err = -EDQUOT;
|
||||
goto fail2;
|
||||
goto fail_drop;
|
||||
}
|
||||
|
||||
err = ext3_init_acl(handle, inode, dir);
|
||||
if (err) {
|
||||
DQUOT_FREE_INODE(inode);
|
||||
DQUOT_DROP(inode);
|
||||
goto fail2;
|
||||
}
|
||||
if (err)
|
||||
goto fail_free_drop;
|
||||
|
||||
err = ext3_init_security(handle,inode, dir);
|
||||
if (err) {
|
||||
DQUOT_FREE_INODE(inode);
|
||||
goto fail2;
|
||||
}
|
||||
if (err)
|
||||
goto fail_free_drop;
|
||||
|
||||
err = ext3_mark_inode_dirty(handle, inode);
|
||||
if (err) {
|
||||
ext3_std_error(sb, err);
|
||||
DQUOT_FREE_INODE(inode);
|
||||
DQUOT_DROP(inode);
|
||||
goto fail2;
|
||||
goto fail_free_drop;
|
||||
}
|
||||
|
||||
ext3_debug("allocating inode %lu\n", inode->i_ino);
|
||||
|
@ -631,7 +626,11 @@ really_out:
|
|||
brelse(bitmap_bh);
|
||||
return ret;
|
||||
|
||||
fail2:
|
||||
fail_free_drop:
|
||||
DQUOT_FREE_INODE(inode);
|
||||
|
||||
fail_drop:
|
||||
DQUOT_DROP(inode);
|
||||
inode->i_flags |= S_NOQUOTA;
|
||||
inode->i_nlink = 0;
|
||||
iput(inode);
|
||||
|
|
Loading…
Reference in a new issue