aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/ialloc.c4
-rw-r--r--fs/ext4/super.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index b0d744cf8b95..ca8986e4b528 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -220,7 +220,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
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 dquot_free_inode(inode); 222 dquot_free_inode(inode);
223 vfs_dq_drop(inode); 223 dquot_drop(inode);
224 224
225 is_directory = S_ISDIR(inode->i_mode); 225 is_directory = S_ISDIR(inode->i_mode);
226 226
@@ -1077,7 +1077,7 @@ fail_free_drop:
1077 dquot_free_inode(inode); 1077 dquot_free_inode(inode);
1078 1078
1079fail_drop: 1079fail_drop:
1080 vfs_dq_drop(inode); 1080 dquot_drop(inode);
1081 inode->i_flags |= S_NOQUOTA; 1081 inode->i_flags |= S_NOQUOTA;
1082 inode->i_nlink = 0; 1082 inode->i_nlink = 0;
1083 unlock_new_inode(inode); 1083 unlock_new_inode(inode);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 56554c8850ec..035516c80df2 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -761,7 +761,7 @@ static void destroy_inodecache(void)
761 761
762static void ext4_clear_inode(struct inode *inode) 762static void ext4_clear_inode(struct inode *inode)
763{ 763{
764 vfs_dq_drop(inode); 764 dquot_drop(inode);
765 ext4_discard_preallocations(inode); 765 ext4_discard_preallocations(inode);
766 if (EXT4_JOURNAL(inode)) 766 if (EXT4_JOURNAL(inode))
767 jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal, 767 jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal,
@@ -1014,7 +1014,6 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
1014 1014
1015static const struct dquot_operations ext4_quota_operations = { 1015static const struct dquot_operations ext4_quota_operations = {
1016 .initialize = dquot_initialize, 1016 .initialize = dquot_initialize,
1017 .drop = dquot_drop,
1018#ifdef CONFIG_QUOTA 1017#ifdef CONFIG_QUOTA
1019 .get_reserved_space = ext4_get_reserved_space, 1018 .get_reserved_space = ext4_get_reserved_space,
1020#endif 1019#endif