From patchwork Thu Jan 1 23:48:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khaled Ahmed X-Patchwork-Id: 5557811 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6FC2E9F344 for ; Thu, 1 Jan 2015 23:49:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A143020256 for ; Thu, 1 Jan 2015 23:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACC1320253 for ; Thu, 1 Jan 2015 23:49:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751712AbbAAXs5 (ORCPT ); Thu, 1 Jan 2015 18:48:57 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:33457 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751461AbbAAXs4 (ORCPT ); Thu, 1 Jan 2015 18:48:56 -0500 Received: by mail-wi0-f174.google.com with SMTP id h11so27049691wiw.1 for ; Thu, 01 Jan 2015 15:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=RsZG2CIYcLjE6Zdtif7eUgGZgdgdHmhYva9C62jXlAk=; b=rihCgGX7L1QSuRI/ytPCqeIBNXg4tOJV1BWzP0FqqLo+qUbTw/QkwThQp5cEuuPewf YBCWUBP69gZEf5mCAtKlbkycxGHD6v0o89cDw3GtM9Lx0bB05W926ai4rct6HM+Cu70E DrwWx+835dcSU7EZqQcKJSPLDFuDxhULGJEo8FDClRcse7HB9dRrOqCC3cKcGj0n0p44 UECL2AuqO6sQLw67Khsa0eVr99yuXoI4ODS/EHqPJCyngY+8acdPuOs7IzGYTN6aq7v+ izKgKhNcVlIGCBlWOwyQX/IcpsZXY7Tk6TcqOKm9/wWcw0M91pZ5j207FGhWHVmw9quG Ig7w== X-Received: by 10.194.81.1 with SMTP id v1mr145501225wjx.50.1420156135488; Thu, 01 Jan 2015 15:48:55 -0800 (PST) Received: from algodev.mortix.net ([197.40.241.89]) by mx.google.com with ESMTPSA id wz5sm62768044wjc.29.2015.01.01.15.48.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Jan 2015 15:48:54 -0800 (PST) From: Khaled Ahmed To: linux-btrfs@vger.kernel.org Cc: Khaled Ahmed Subject: [PATCH] Fixing quota error when removing files from a limit exceeded subvols Date: Fri, 2 Jan 2015 01:48:34 +0200 Message-Id: <1420156114-10849-1-git-send-email-khaled.gnu@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Khaled Ahmed --- 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 48b60db..b85200d 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -2408,14 +2408,14 @@ int btrfs_qgroup_reserve(struct btrfs_root *root, u64 num_bytes) if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) && qg->reserved + (s64)qg->rfer + num_bytes > - qg->max_rfer) { + qg->max_rfer - 1 ) { ret = -EDQUOT; goto out; } if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) && qg->reserved + (s64)qg->excl + num_bytes > - qg->max_excl) { + qg->max_excl - 1) { ret = -EDQUOT; goto out; }