From patchwork Mon Apr 15 12:56:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2445051 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 5C825DF2E5 for ; Mon, 15 Apr 2013 12:57:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751385Ab3DOM5X (ORCPT ); Mon, 15 Apr 2013 08:57:23 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:36651 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751086Ab3DOM5W (ORCPT ); Mon, 15 Apr 2013 08:57:22 -0400 Received: by mail-pb0-f41.google.com with SMTP id mc17so2509055pbc.14 for ; Mon, 15 Apr 2013 05:57:22 -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=ggvNUPcktywqSCaw714veCbGQaaya3E8E5j4aRUpD3E=; b=J3D6nUdn3naOPJJ3AFAVuOBcStNZS0MIRpPQ0e4C+SLvVBo7RjoaMBSDuzP0/a+h2k WCaWVuIWoFUiKdkuYX+OOniUYHJHLSjjYtljVmePnQ9A1FzpBAjlaCr7f6YHvIe1n/jn GbOA0QRaiQlvik3X+iea1RMwfU8p6TCNOeahnXtA8Q7Bu4I1skKci2WJ1kspApnp//3O wS6zi5z5MyknfGR/msrBXrClcLlJzQ35YzBVipkGcsJ4xK6fb9JRn44UUe12JACbsSHt r2UmFHL/qgv9wjorp6LctlYdL2ZlcaJYwwFQ1ninXX+PUiQQuGdG8nNPMPtuKp3hri25 SvdA== X-Received: by 10.68.104.2 with SMTP id ga2mr28949178pbb.116.1366030642080; Mon, 15 Apr 2013 05:57:22 -0700 (PDT) Received: from localhost.localdomain.localdomain ([112.2.228.227]) by mx.google.com with ESMTPS id bs3sm20241282pbb.36.2013.04.15.05.57.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 05:57:21 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: Wang Shilong Subject: [PATCH V2 RESEND] Btrfs: fix confusing edquot happening case Date: Mon, 15 Apr 2013 20:56:49 +0800 Message-Id: <1366030609-9245-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;