aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-03-03 09:05:01 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:28 -0500
commit63936ddaa16b9486e2d426ed7b09f559a5c60f87 (patch)
tree4cb1c4581799e10c26dd71d1a7d420de3c2cfd05 /fs/ext4
parent5dd4056db84387975140ff2568eaa0406f07985e (diff)
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>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/ialloc.c10
-rw-r--r--fs/ext4/super.c2
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index f3624ead4f6c..b0d744cf8b95 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -219,7 +219,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
219 */ 219 */
220 vfs_dq_init(inode); 220 vfs_dq_init(inode);
221 ext4_xattr_delete_inode(handle, inode); 221 ext4_xattr_delete_inode(handle, inode);
222 vfs_dq_free_inode(inode); 222 dquot_free_inode(inode);
223 vfs_dq_drop(inode); 223 vfs_dq_drop(inode);
224 224
225 is_directory = S_ISDIR(inode->i_mode); 225 is_directory = S_ISDIR(inode->i_mode);
@@ -1034,10 +1034,10 @@ got:
1034 ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize; 1034 ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
1035 1035
1036 ret = inode; 1036 ret = inode;
1037 if (vfs_dq_alloc_inode(inode)) { 1037 vfs_dq_init(inode);
1038 err = -EDQUOT; 1038 err = dquot_alloc_inode(inode);
1039 if (err)
1039 goto fail_drop; 1040 goto fail_drop;
1040 }
1041 1041
1042 err = ext4_init_acl(handle, inode, dir); 1042 err = ext4_init_acl(handle, inode, dir);
1043 if (err) 1043 if (err)
@@ -1074,7 +1074,7 @@ really_out:
1074 return ret; 1074 return ret;
1075 1075
1076fail_free_drop: 1076fail_free_drop:
1077 vfs_dq_free_inode(inode); 1077 dquot_free_inode(inode);
1078 1078
1079fail_drop: 1079fail_drop:
1080 vfs_dq_drop(inode); 1080 vfs_dq_drop(inode);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index fa8f4deda652..d231da8798e3 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1017,8 +1017,6 @@ static const struct dquot_operations ext4_quota_operations = {
1017#ifdef CONFIG_QUOTA 1017#ifdef CONFIG_QUOTA
1018 .get_reserved_space = ext4_get_reserved_space, 1018 .get_reserved_space = ext4_get_reserved_space,
1019#endif 1019#endif
1020 .alloc_inode = dquot_alloc_inode,
1021 .free_inode = dquot_free_inode,
1022 .transfer = dquot_transfer, 1020 .transfer = dquot_transfer,
1023 .write_dquot = ext4_write_dquot, 1021 .write_dquot = ext4_write_dquot,
1024 .acquire_dquot = ext4_acquire_dquot, 1022 .acquire_dquot = ext4_acquire_dquot,