Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails (a9870c0e) · Commits · 戴 / test

commit leads into another bug. If it is just because qgroup_reserve fails, the function btrfs_qgroup_free should not be called, otherwise, it will cause the wrong quota accounting. Signed-off-by:

Wang Shilong <wangsl-fnst@cn.fujitsu.com> Signed-off-by:

Josef Bacik <jbacik@fusionio.com>

fs/btrfs/extent-tree.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -4772,9 +4772,14 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
		* ret != 0 here means the qgroup reservation failed, we go straight to
		* the shared error handling then.
		*/
		if (ret == 0)
		if (ret == 0) {
		ret = reserve_metadata_bytes(root, block_rsv,
		to_reserve, flush);
		if (ret && root->fs_info->quota_enabled) {
		btrfs_qgroup_free(root, num_bytes +
		nr_extents * root->leafsize);
		}
		}

		if (ret) {
		u64 to_free = 0;
		@@ -4805,10 +4810,6 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
		btrfs_ino(inode),
		to_free, 0);
		}
		if (root->fs_info->quota_enabled) {
		btrfs_qgroup_free(root, num_bytes +
		nr_extents * root->leafsize);
		}
		if (delalloc_lock)
		mutex_unlock(&BTRFS_I(inode)->delalloc_mutex);
		return ret;

Admin message