From 4b684326b1cb2cc454230ac2628524c2ba356b82 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Mon, 15 Apr 2013 12:56:49 +0000 Subject: [PATCH] --- yaml --- r: 374873 b: refs/heads/master c: b4fcd6be6bbd702ae1a6545c9b413681850a9814 h: refs/heads/master i: 374871: 2f8db719f35977882897cbf7ebaeefeff1be2bb3 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/qgroup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 968f686a6e18..18b8d95aec9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36902d4cc95382771f501f8d1d8c0a9b356500d +refs/heads/master: b4fcd6be6bbd702ae1a6545c9b413681850a9814 diff --git a/trunk/fs/btrfs/qgroup.c b/trunk/fs/btrfs/qgroup.c index e089fc108483..4beea047f4ed 100644 --- a/trunk/fs/btrfs/qgroup.c +++ b/trunk/fs/btrfs/qgroup.c @@ -1616,14 +1616,14 @@ int btrfs_qgroup_reserve(struct btrfs_root *root, u64 num_bytes) qg = (struct btrfs_qgroup *)(uintptr_t)unode->aux; 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) { ret = -EDQUOT; goto out; } 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) { ret = -EDQUOT; goto out;