diff options
| author | Jan Kara <jack@suse.cz> | 2022-12-07 12:59:27 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-12-08 22:03:15 -0500 |
| commit | 1485f726c6dec1a1f85438f2962feaa3d585526f (patch) | |
| tree | a10d63b1da2fa3c464d7b9db9cd423e66af593d7 /fs/ext4 | |
| parent | dae999602eeb0c5482bb62df7fda903f1edc0ff3 (diff) | |
| download | linux-stable-1485f726c6dec1a1f85438f2962feaa3d585526f.tar.gz linux-stable-1485f726c6dec1a1f85438f2962feaa3d585526f.tar.bz2 linux-stable-1485f726c6dec1a1f85438f2962feaa3d585526f.zip | |
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>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 202953b5db49..8067ccda34e4 100644 --- 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); |