From patchwork Mon Apr 8 10:56:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2407571 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 8865FDFB78 for ; Mon, 8 Apr 2013 10:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762811Ab3DHK4v (ORCPT ); Mon, 8 Apr 2013 06:56:51 -0400 Received: from mail-da0-f49.google.com ([209.85.210.49]:40203 "EHLO mail-da0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759346Ab3DHK4v (ORCPT ); Mon, 8 Apr 2013 06:56:51 -0400 Received: by mail-da0-f49.google.com with SMTP id t11so2531765daj.8 for ; Mon, 08 Apr 2013 03:56:50 -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=VBaZixdXCkV1HCseR7wM8wtWIqJlAwesKMCAx2BRaL0=; b=BtFjksVg58mnFDFJa2rcrfMIfTcUX9QCLTO3qUcHcv1u4uixOjE7a2sSdyD34DpmOt XqBNFyeXh81HYlEsKmfudc3EM36HdSn4s1G/zsyr89DfzJ4WIFOWhAEUpH28W0ct6BKv yaZlGCkKaRGmx6WsSE7BcamK1uoDBKPuvQf2PIncojAvFlV1TVoNQPZe492CluuCj6CR mdga1mHrkDytwigVjebjycSaNGN2WR7K/Eb+K79EYOY7KvtzhmdbsLxD8gks1ykKk1ax VPwTrYAElYbkQoqFusj00B68J9x/1Ob35JRQpzO7D8HcgnN2HGhgWLlcLYW2P15qfr+n JfSw== X-Received: by 10.66.167.69 with SMTP id zm5mr22414896pab.90.1365418610362; Mon, 08 Apr 2013 03:56:50 -0700 (PDT) Received: from localhost.localdomain.localdomain ([223.65.184.63]) by mx.google.com with ESMTPS id xl10sm38704656pac.15.2013.04.08.03.56.48 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 08 Apr 2013 03:56:49 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: sensille@gmx.net, wangsl-fnst@cn.fujitsu.com Subject: [PATCH] Btrfs: use tree_root to avoid edquot when disabling quota Date: Mon, 8 Apr 2013 18:56:22 +0800 Message-Id: <1365418582-1590-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 Steps to reproduce: mkfs.btrfs mount btrfs quota enable btrfs sub create /subv btrfs qgroup limit 10K /subv btrfs quota disable /subv It is wrong for qgroup to reserve when disabling quota, so just use tree_root to avoid edquot when disabling quota. Signed-off-by: Wang Shilong --- fs/btrfs/ioctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 898c572..180e486 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3694,7 +3694,7 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg) } if (sa->cmd != BTRFS_QUOTA_CTL_RESCAN) { - trans = btrfs_start_transaction(root, 2); + trans = btrfs_start_transaction(root->fs_info->tree_root, 2); if (IS_ERR(trans)) { ret = PTR_ERR(trans); goto out; @@ -3720,7 +3720,7 @@ static long btrfs_ioctl_quota_ctl(struct file *file, void __user *arg) ret = -EFAULT; if (trans) { - err = btrfs_commit_transaction(trans, root); + err = btrfs_commit_transaction(trans, root->fs_info->tree_root); if (err && !ret) ret = err; }