dquot: cleanup inode allocation / freeing routines
Get rid of the alloc_inode and free_inode dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Also get rid of the vfs_dq_alloc/vfs_dq_free wrappers and always call the lowlevel dquot_alloc_inode / dqout_free_inode routines directly, which now lose the number argument which is always 1. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:

committed by
Jan Kara

parent
5dd4056db8
commit
63936ddaa1
@@ -219,7 +219,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
|
||||
*/
|
||||
vfs_dq_init(inode);
|
||||
ext4_xattr_delete_inode(handle, inode);
|
||||
vfs_dq_free_inode(inode);
|
||||
dquot_free_inode(inode);
|
||||
vfs_dq_drop(inode);
|
||||
|
||||
is_directory = S_ISDIR(inode->i_mode);
|
||||
@@ -1034,10 +1034,10 @@ got:
|
||||
ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
|
||||
|
||||
ret = inode;
|
||||
if (vfs_dq_alloc_inode(inode)) {
|
||||
err = -EDQUOT;
|
||||
vfs_dq_init(inode);
|
||||
err = dquot_alloc_inode(inode);
|
||||
if (err)
|
||||
goto fail_drop;
|
||||
}
|
||||
|
||||
err = ext4_init_acl(handle, inode, dir);
|
||||
if (err)
|
||||
@@ -1074,7 +1074,7 @@ really_out:
|
||||
return ret;
|
||||
|
||||
fail_free_drop:
|
||||
vfs_dq_free_inode(inode);
|
||||
dquot_free_inode(inode);
|
||||
|
||||
fail_drop:
|
||||
vfs_dq_drop(inode);
|
||||
|
Reference in New Issue
Block a user