diff options
Diffstat (limited to 'fs/ext3')
-rw-r--r-- | fs/ext3/ialloc.c | 4 | ||||
-rw-r--r-- | fs/ext3/super.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 8bf00e997c3..7d7238f9f6f 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
@@ -126,7 +126,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode) | |||
126 | vfs_dq_init(inode); | 126 | vfs_dq_init(inode); |
127 | ext3_xattr_delete_inode(handle, inode); | 127 | ext3_xattr_delete_inode(handle, inode); |
128 | dquot_free_inode(inode); | 128 | dquot_free_inode(inode); |
129 | vfs_dq_drop(inode); | 129 | dquot_drop(inode); |
130 | 130 | ||
131 | is_directory = S_ISDIR(inode->i_mode); | 131 | is_directory = S_ISDIR(inode->i_mode); |
132 | 132 | ||
@@ -622,7 +622,7 @@ fail_free_drop: | |||
622 | dquot_free_inode(inode); | 622 | dquot_free_inode(inode); |
623 | 623 | ||
624 | fail_drop: | 624 | fail_drop: |
625 | vfs_dq_drop(inode); | 625 | dquot_drop(inode); |
626 | inode->i_flags |= S_NOQUOTA; | 626 | inode->i_flags |= S_NOQUOTA; |
627 | inode->i_nlink = 0; | 627 | inode->i_nlink = 0; |
628 | unlock_new_inode(inode); | 628 | unlock_new_inode(inode); |
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 2277b1a98e6..0163d0dae12 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -529,7 +529,7 @@ static void ext3_clear_inode(struct inode *inode) | |||
529 | { | 529 | { |
530 | struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info; | 530 | struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info; |
531 | 531 | ||
532 | vfs_dq_drop(inode); | 532 | dquot_drop(inode); |
533 | ext3_discard_reservation(inode); | 533 | ext3_discard_reservation(inode); |
534 | EXT3_I(inode)->i_block_alloc_info = NULL; | 534 | EXT3_I(inode)->i_block_alloc_info = NULL; |
535 | if (unlikely(rsv)) | 535 | if (unlikely(rsv)) |
@@ -753,7 +753,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
753 | 753 | ||
754 | static const struct dquot_operations ext3_quota_operations = { | 754 | static const struct dquot_operations ext3_quota_operations = { |
755 | .initialize = dquot_initialize, | 755 | .initialize = dquot_initialize, |
756 | .drop = dquot_drop, | ||
757 | .write_dquot = ext3_write_dquot, | 756 | .write_dquot = ext3_write_dquot, |
758 | .acquire_dquot = ext3_acquire_dquot, | 757 | .acquire_dquot = ext3_acquire_dquot, |
759 | .release_dquot = ext3_release_dquot, | 758 | .release_dquot = ext3_release_dquot, |