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

Commit b4fcd6be authored by Wang Shilong's avatar Wang Shilong Committed by Josef Bacik
Browse files

Btrfs: fix confusing edquot happening case



Step to reproduce:
	mkfs.btrfs <disk>
	mount <disk> <mnt>
	dd if=/dev/zero of=/<mnt>/data bs=1M count=10
	sync
	btrfs quota enable <mnt>
	btrfs qgroup create 0/5 <mnt>
	btrfs qgroup limit 5M 0/5 <mnt>
	rm -f /<mnt>/data
	sync
	btrfs qgroup show <mnt>
	dd if=/dev/zero of=data bs=1M count=1

>From the perspective of users, qgroup's referenced or exclusive
is negative,but user can not continue to write data! a workaround
way is to cast u64 to s64 when doing qgroup reservation.

Signed-off-by: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Reviewed-by: default avatarArne Jansen <sensille@gmx.net>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent e36902d4
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -1616,14 +1616,14 @@ int btrfs_qgroup_reserve(struct btrfs_root *root, u64 num_bytes)
		qg = (struct btrfs_qgroup *)(uintptr_t)unode->aux;
		qg = (struct btrfs_qgroup *)(uintptr_t)unode->aux;


		if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) &&
		if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) &&
		    qg->reserved + qg->rfer + num_bytes >
		    qg->reserved + (s64)qg->rfer + num_bytes >
		    qg->max_rfer) {
		    qg->max_rfer) {
			ret = -EDQUOT;
			ret = -EDQUOT;
			goto out;
			goto out;
		}
		}


		if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) &&
		if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) &&
		    qg->reserved + qg->excl + num_bytes >
		    qg->reserved + (s64)qg->excl + num_bytes >
		    qg->max_excl) {
		    qg->max_excl) {
			ret = -EDQUOT;
			ret = -EDQUOT;
			goto out;
			goto out;