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
@@ -121,7 +121,7 @@ void ext2_free_inode (struct inode * inode)
|
||||
if (!is_bad_inode(inode)) {
|
||||
/* Quota is already initialized in iput() */
|
||||
ext2_xattr_delete_inode(inode);
|
||||
vfs_dq_free_inode(inode);
|
||||
dquot_free_inode(inode);
|
||||
vfs_dq_drop(inode);
|
||||
}
|
||||
|
||||
@@ -586,10 +586,10 @@ got:
|
||||
goto fail_drop;
|
||||
}
|
||||
|
||||
if (vfs_dq_alloc_inode(inode)) {
|
||||
err = -EDQUOT;
|
||||
vfs_dq_init(inode);
|
||||
err = dquot_alloc_inode(inode);
|
||||
if (err)
|
||||
goto fail_drop;
|
||||
}
|
||||
|
||||
err = ext2_init_acl(inode, dir);
|
||||
if (err)
|
||||
@@ -605,7 +605,7 @@ got:
|
||||
return inode;
|
||||
|
||||
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