From patchwork Wed Feb 20 14:16:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2167561 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 64F493FDF1 for ; Wed, 20 Feb 2013 14:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935393Ab3BTOQq (ORCPT ); Wed, 20 Feb 2013 09:16:46 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34504 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935350Ab3BTOQq (ORCPT ); Wed, 20 Feb 2013 09:16:46 -0500 Received: by mail-pa0-f54.google.com with SMTP id fa10so4068122pad.27 for ; Wed, 20 Feb 2013 06:16:45 -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=zvA2SZqNAtP4m82U6MlPfF5UDoxBcCSw6jYYX4OP2DE=; b=Ztc1aiKDiASFFodhabZfQbVAcwLxBqvwgUSfdMOo/knJDVLQuvgiWi+kiuv8QE3/yf pDBaU8MzCAPluflLfvb2vcmqefQ9AYj/Z7RC5yCYj5HhopaK8Xxc5xiVpLJIiD3m3+TW f8JX4VVwSzeuZWJg7fjbKPu9HxzWvvCdCbvRKNJJXcCOnXddpFCwt+GZ6DAZMAmZBkpx MY2IBSdZ7KkjL7P5M0u4i76WKOtnv8MrSeVzrm42Pukp5G2oF/3MdlmRGTtaOvTGb44B hUlkJVDu6vWbz6naUJawNy78XI12QGDKkaTbtXrVbyEzOIcsl8xSlW7L+C9nobzNMEEW P+6g== X-Received: by 10.68.232.38 with SMTP id tl6mr49096305pbc.153.1361369805581; Wed, 20 Feb 2013 06:16:45 -0800 (PST) Received: from localhost.localdomain ([112.23.189.34]) by mx.google.com with ESMTPS id ax3sm21796767pbd.42.2013.02.20.06.16.43 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 Feb 2013 06:16:45 -0800 (PST) From: Wang shilong To: linux-btrfs@vger.kernel.org Cc: wangshilong1991@gmail.com, Miao Xie , Wang Shilong , Arne Jansen Subject: [PATCH 2/2] Btrfs: fix missing release of qgroup reservation in commit_transaction() Date: Wed, 20 Feb 2013 22:16:39 +0800 Message-Id: <1361369799-3539-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: Miao Xie We forget to free qgroup reservation in commit_transaction(),fix it. Signed-off-by: Miao Xie Signed-off-by: Wang Shilong Cc: Arne Jansen --- fs/btrfs/transaction.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index fc03aa6..b8d4a6a 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1494,6 +1494,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } cur_trans = trans->transaction; @@ -1772,6 +1776,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, cleanup_transaction: btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; + if (trans->qgroup_reserved) { + btrfs_qgroup_free(root, trans->qgroup_reserved); + trans->qgroup_reserved = 0; + } btrfs_printk(root->fs_info, "Skipping commit of aborted transaction.\n"); // WARN_ON(1); if (current->journal_info == trans)