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
@@ -125,7 +125,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode)
|
||||
*/
|
||||
vfs_dq_init(inode);
|
||||
ext3_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);
|
||||
@@ -588,10 +588,10 @@ got:
|
||||
sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0;
|
||||
|
||||
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 = ext3_init_acl(handle, inode, dir);
|
||||
if (err)
|
||||
@@ -619,7 +619,7 @@ really_out:
|
||||
return ret;
|
||||
|
||||
fail_free_drop:
|
||||
vfs_dq_free_inode(inode);
|
||||
dquot_free_inode(inode);
|
||||
|
||||
fail_drop:
|
||||
vfs_dq_drop(inode);
|
||||
|
@@ -752,8 +752,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
|
||||
static const struct dquot_operations ext3_quota_operations = {
|
||||
.initialize = dquot_initialize,
|
||||
.drop = dquot_drop,
|
||||
.alloc_inode = dquot_alloc_inode,
|
||||
.free_inode = dquot_free_inode,
|
||||
.transfer = dquot_transfer,
|
||||
.write_dquot = ext3_write_dquot,
|
||||
.acquire_dquot = ext3_acquire_dquot,
|
||||
|
Reference in New Issue
Block a user