From patchwork Mon Apr 15 12:48:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2444921 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C7A44DF2E5 for ; Mon, 15 Apr 2013 12:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933989Ab3DOMtc (ORCPT ); Mon, 15 Apr 2013 08:49:32 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:64582 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933036Ab3DOMtb (ORCPT ); Mon, 15 Apr 2013 08:49:31 -0400 Received: by mail-pb0-f42.google.com with SMTP id up7so2484294pbc.29 for ; Mon, 15 Apr 2013 05:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Shx7QuTy4Ayx4JyS7ud2sfgCCYCsp27IlAFHt6skP4w=; b=HibVDyDTiDwq99URukV/+rrx/78giFFK+HVvjcVy0MxuV0fs5GWZNlfmc/gtu6vyhx mGxMgVptwVa6+gK++k2ogKgM4sqThcecutM1gUBzpHpmUBK0pyWMQZu/+VMCkw1x8aK/ aQ6sgQ2KteKRwsnyeT5dnz58qtgS2lzEzFguIwCngrH+XFz/T9rBTupxmz5FJ1R+im6F irRUSxdva4TfODfMbuoYVKjBzvHSNnStm0YjhBuRMvIkOMuTk4ICNQweGxvkkHpN9W1f LaCsQoToVqnLE2s7ff87TLw0CKk0FmFRF6I8ICLdZqkCWlDSUz0gG8TYwdLF9FQyduUk 6g8w== X-Received: by 10.68.180.194 with SMTP id dq2mr28668696pbc.175.1366030171042; Mon, 15 Apr 2013 05:49:31 -0700 (PDT) Received: from localhost.localdomain.localdomain ([112.2.228.227]) by mx.google.com with ESMTPS id ts3sm20260082pbc.12.2013.04.15.05.49.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 05:49:30 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: Wang Shilong , Wang Shilong Subject: [PATCH V2] Btrfs: fix confusing edquot happening case Date: Mon, 15 Apr 2013 20:48:36 +0800 Message-Id: <1366030116-9019-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Wang Shilong Step to reproduce: mkfs.btrfs mount dd if=/dev/zero of=//data bs=1M count=10 sync btrfs quota enable btrfs qgroup create 0/5 btrfs qgroup limit 5M 0/5 rm -f //data sync btrfs qgroup show 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: Wang Shilong Reviewed-by: Arne Jansen --- Changelog v1->v2: -use s64 instead of signed long long --- fs/btrfs/qgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index b44124d..ab364a2 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1523,14 +1523,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;