From patchwork Fri Mar 1 11:33:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2200951 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B708F3FCF6 for ; Fri, 1 Mar 2013 11:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751917Ab3CALdI (ORCPT ); Fri, 1 Mar 2013 06:33:08 -0500 Received: from mail-pb0-f51.google.com ([209.85.160.51]:62142 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711Ab3CALdH (ORCPT ); Fri, 1 Mar 2013 06:33:07 -0500 Received: by mail-pb0-f51.google.com with SMTP id un15so1690285pbc.24 for ; Fri, 01 Mar 2013 03:33:07 -0800 (PST) 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=5KAwurn+yyiRWJ1gV218h0c8gvMAS/RE0ppJmLFMkvo=; b=aGsGDeQOaiAi+95XDY+rvU2q7phlsC2SqmkdW2oeBNOvQXbGQoGi3/HZY1BvAJflPJ erLPQY6DpmEiJ1Tavx7r4cN1SZmtDuMrMHHAlGcDCK6CAWNSHdGYhbCbO8y2lh8pXvWN u08qYe4Bh8wECWRgvEfeIbQXuA7wZSS45eTKmu5Kq0t30uxwqwkuVqnAEk01yC4FjnAg dqTxWykKa32RuavebeknR8ibmSFWIrGCWyE5yjjj79oQpBOkPraNEl3bTcEayVUgsEav /4wl7EEfp/lS3UPPLn2XWr5zFKPRWfNaCxc7ggxfWwTZ4ysbepnGBAHwnBfmXhAD+Wl1 PWWg== X-Received: by 10.66.146.197 with SMTP id te5mr17962175pab.158.1362137587074; Fri, 01 Mar 2013 03:33:07 -0800 (PST) Received: from localhost.localdomain ([223.65.184.168]) by mx.google.com with ESMTPS id jp9sm11805857pbb.7.2013.03.01.03.33.04 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 01 Mar 2013 03:33:06 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: sensille@gmx.net, list.btrfs@jan-o-sch.net, chris.mason@fusionio.com, wangshilong1991@gmail.com Subject: [PATCH 1/2] Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails Date: Fri, 1 Mar 2013 19:33:01 +0800 Message-Id: <1362137581-1797-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 commit eb6b88d92c6df083dd09a8c471011e3788dfd7c6 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 --- fs/btrfs/extent-tree.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 34ade06..f0c960b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -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;