Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 079788d0 authored by Wang Shilong's avatar Wang Shilong Committed by Theodore Ts'o
Browse files

ext4: fix project quota accounting without quota limits enabled 



We should always transfer quota accounting, regardless of whether
quota limits are enabled.

Steps to reproduce:
  # mkfs.ext4 /dev/sda4 -O quota,project
  # mount /dev/sda4 /mnt/test
  # cp /bin/bash /mnt/test
  # chattr -p 123 /mnt/test/bash
  # quota -v -P 123

Signed-off-by: default avatarWang Shilong <wshilong@ddn.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5b9554dc

fs/ext4/ioctl.c

+8 −10
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) 
	kprojid_t kprojid;

	struct ext4_iloc iloc;

	struct ext4_inode *raw_inode;

	struct dquot *transfer_to[MAXQUOTAS] = { };



	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,

			EXT4_FEATURE_RO_COMPAT_PROJECT)) {
@@ -361,9 +362,6 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) 
	if (err)

		goto out_stop;



	if (sb_has_quota_limits_enabled(sb, PRJQUOTA)) {

		struct dquot *transfer_to[MAXQUOTAS] = { };



	transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));

	if (!IS_ERR(transfer_to[PRJQUOTA])) {

		err = __dquot_transfer(inode, transfer_to);
@@ -371,7 +369,7 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) 
		if (err)

			goto out_dirty;

	}

	}



	EXT4_I(inode)->i_projid = kprojid;

	inode->i_ctime = ext4_current_time(inode);

out_dirty: