ext4: initialize quota before expanding inode in setproject ioctl

Make sure we initialize quotas before possibly expanding inode space
(and thus maybe needing to allocate external xattr block) in
ext4_ioctl_setproject(). This prevents not accounting the necessary
block allocation.

Signed-off-by: Jan Kara <jack@suse.cz>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20221207115937.26601-1-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 202953b5db49f153d697f7a6c7ec91c91c0c2a07..8067ccda34e457ed68728751337173ef90c4de49 100644 (file)
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -732,6 +732,10 @@ static int ext4_ioctl_setproject(struct inode *inode, __u32 projid)
        if (ext4_is_quota_file(inode))
                return err;
 
+       err = dquot_initialize(inode);
+       if (err)
+               return err;
+
        err = ext4_get_inode_loc(inode, &iloc);
        if (err)
                return err;
@@ -747,10 +751,6 @@ static int ext4_ioctl_setproject(struct inode *inode, __u32 projid)
                brelse(iloc.bh);
        }
 
-       err = dquot_initialize(inode);
-       if (err)
-               return err;
-
        handle = ext4_journal_start(inode, EXT4_HT_QUOTA,
                EXT4_QUOTA_INIT_BLOCKS(sb) +
                EXT4_QUOTA_DEL_BLOCKS(sb) + 3);