From patchwork Sun Apr 7 10:50:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2402921 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 D4D99DF2A1 for ; Sun, 7 Apr 2013 10:51:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933348Ab3DGKvP (ORCPT ); Sun, 7 Apr 2013 06:51:15 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:41445 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933320Ab3DGKvD (ORCPT ); Sun, 7 Apr 2013 06:51:03 -0400 Received: by mail-pa0-f42.google.com with SMTP id kq13so2762604pab.15 for ; Sun, 07 Apr 2013 03:51:02 -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:in-reply-to :references; bh=wWZbRQwNxGB2JigNH7Zg539K4h/XBekCm/eBxkyh9jY=; b=RQMQO4k0QSa5HEoQyxlZkzwoPsFp/OMvsQk6tOIvt5imirf1h0lcN8C9ZinG4/SICz 2Oxi0f3qPBvB0FHN4r8ABhPb2YdEZ5a9NvnfwOyQVQYQH5wvCid67N4PdaBm5CshIEat w+ILWmsmRkOGDui36kRmCSD4qdMP81QkP7Qnf365wgbNe9gW5DIDK3x7tSjXlwaHqI51 E423IhfCj/ziI1GjtoSttu/qErbaVYpU4QQvebXIteeT2MOTsJ1xj2deDLRzhs1MEwVI rCVLqbGrdyx9fLabNVTkG5x0UvdtIJB292AM50oJrHwqo6D4eU3AQJ0aYNAuEeqNznCW BZFw== X-Received: by 10.66.197.165 with SMTP id iv5mr27261573pac.7.1365331862068; Sun, 07 Apr 2013 03:51:02 -0700 (PDT) Received: from localhost.localdomain.localdomain ([112.2.228.26]) by mx.google.com with ESMTPS id pa2sm27634891pac.9.2013.04.07.03.50.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 07 Apr 2013 03:51:01 -0700 (PDT) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: wangsl-fnst@cn.fujitsu.com, miaox@cn.fujitsu.com, sensille@gmx.net Subject: [PATCH V3 5/5] Btrfs: fix a warning when updating qgroup limit Date: Sun, 7 Apr 2013 18:50:20 +0800 Message-Id: <1365331820-973-6-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1365331820-973-1-git-send-email-wangshilong1991@gmail.com> References: <1365331820-973-1-git-send-email-wangshilong1991@gmail.com> 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 btrfs quota enable btrfs qgroup limit 0/1 dmesg If the relative qgroup dosen't exist, flag 'BTRFS_QGROUP_STATUS_ FLAG_INCONSISTENT' will be set, and print the noise message. This is wrong, we can just move find_qgroup_rb() before update_qgroup_limit_item().this dosen't change the logic of the function. But it can avoid unnecessary noise message and wrong set of flag. Signed-off-by: Wang Shilong --- fs/btrfs/qgroup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index d0870c8..deaa2e8 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1094,6 +1094,11 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, goto out; } + qgroup = find_qgroup_rb(fs_info, qgroupid); + if (!qgroup) { + ret = -ENOENT; + goto out; + } ret = update_qgroup_limit_item(trans, quota_root, qgroupid, limit->flags, limit->max_rfer, limit->max_excl, limit->rsv_rfer, @@ -1104,11 +1109,6 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, (unsigned long long)qgroupid); } - qgroup = find_qgroup_rb(fs_info, qgroupid); - if (!qgroup) { - ret = -ENOENT; - goto out; - } spin_lock(&fs_info->qgroup_lock); qgroup->lim_flags = limit->flags; qgroup->max_rfer = limit->max_rfer;