From patchwork Wed Feb 20 14:16:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2167551 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 0F1483FE37 for ; Wed, 20 Feb 2013 14:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935337Ab3BTOQa (ORCPT ); Wed, 20 Feb 2013 09:16:30 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:38661 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934593Ab3BTOQ3 (ORCPT ); Wed, 20 Feb 2013 09:16:29 -0500 Received: by mail-pb0-f41.google.com with SMTP id um15so2916333pbc.28 for ; Wed, 20 Feb 2013 06:16:29 -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=BeX1joTF/Bx1wP32V6fLGT59WqtAdlXrKVQsXS7IpxA=; b=D4ALqTHCNtLcTPbQl6hnhw9s8H5HYUS0jyl0rPPhsSdUFVW65r3YZ53rItCmecxhq4 vEHsQfvq7nsOVTEMZka4SaRrAbqmoV+DYDkjw1KCan6gsIvSFWdn4ApdxuYKNfbSge6W CKOvR9tGJDqQjI7iK2I1P5C7kpZLSBNl4j/Z0Nlemh2vkCV4kHnvJRWqMWUtyhpU28pt J/y5lkSZk8ILOrk8tDYikcotFjaVKFhfYH2WYi2TMPjsbE3SkIftqpnye46Hx0EWY7Kt iFix0XeHc1KppiOo4/Cd08QRTHERMv5dOwIzhk74JcjQzO4DwAhZMumLu75JxheBxNea bjOA== X-Received: by 10.66.144.3 with SMTP id si3mr2641712pab.105.1361369789395; Wed, 20 Feb 2013 06:16:29 -0800 (PST) Received: from localhost.localdomain ([112.23.189.34]) by mx.google.com with ESMTPS id qf7sm21795614pbb.2.2013.02.20.06.16.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 Feb 2013 06:16:28 -0800 (PST) From: Wang shilong To: linux-btrfs@vger.kernel.org Cc: wangshilong1991@gmail.com, Wang Shilong , Arne Jansen Subject: [PATCH 1/2] Btrfs: fix missing check before disabling quota Date: Wed, 20 Feb 2013 22:16:14 +0800 Message-Id: <1361369774-2703-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 The original code forget to check whether quota has been disabled firstly, and it will return 'EINVAL' and return error to users if quota has been disabled,it will be unfriendly and confusing for users to see that. So just return directly if quota has been disabled. Signed-off-by: Wang Shilong Cc: Arne Jansen --- fs/btrfs/qgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index a5c8562..2efd724 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -847,6 +847,10 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans, int ret = 0; spin_lock(&fs_info->qgroup_lock); + if (!fs_info->quota_root) { + spin_unlock(&fs_info->qgroup_lock); + return 0; + } fs_info->quota_enabled = 0; fs_info->pending_quota_state = 0; quota_root = fs_info->quota_root;