Merge tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs

[linux.git] / fs / ext4 / ialloc.c

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 764ff4c56233f8d66da4f2eff3ba28c5ea430a49..dc333e8e51e89a4951f02b0fbc2a91cf32434a59 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -265,13 +265,8 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
        ext4_debug("freeing inode %lu\n", ino);
        trace_ext4_free_inode(inode);
 
-       /*
-        * Note: we must free any quota before locking the superblock,
-        * as writing the quota to disk may need the lock as well.
-        */
        dquot_initialize(inode);
        dquot_free_inode(inode);
-       dquot_drop(inode);
 
        is_directory = S_ISDIR(inode->i_mode);
 
@@ -927,7 +922,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
                        BUG_ON(nblocks <= 0);
                        handle = __ext4_journal_start_sb(dir->i_sb, line_no,
                                                         handle_type, nblocks,
-                                                        0);
+                                                        0, 0);
                        if (IS_ERR(handle)) {
                                err = PTR_ERR(handle);
                                ext4_std_error(sb, err);