From patchwork Mon Oct 2 08:34:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsutomu Itoh X-Patchwork-Id: 9980419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EA92460365 for ; Mon, 2 Oct 2017 08:45:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC7F228994 for ; Mon, 2 Oct 2017 08:45:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D121E28996; Mon, 2 Oct 2017 08:45:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24BDC28994 for ; Mon, 2 Oct 2017 08:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750943AbdJBIpx (ORCPT ); Mon, 2 Oct 2017 04:45:53 -0400 Received: from mgwym03.jp.fujitsu.com ([211.128.242.42]:28208 "EHLO mgwym03.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878AbdJBIpx (ORCPT ); Mon, 2 Oct 2017 04:45:53 -0400 X-Greylist: delayed 663 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Oct 2017 04:45:52 EDT Received: from yt-mxoi1.gw.nic.fujitsu.com (unknown [192.168.229.67]) by mgwym03.jp.fujitsu.com with smtp id 75c5_48a6_74ab1da7_df20_4c5e_8054_95392f58a265; Mon, 02 Oct 2017 17:34:46 +0900 Received: from m3051.s.css.fujitsu.com (m3051.s.css.fujitsu.com [10.134.21.209]) by yt-mxoi1.gw.nic.fujitsu.com (Postfix) with ESMTP id C60A7AC01BA for ; Mon, 2 Oct 2017 17:34:44 +0900 (JST) Received: from WIN-5MHF4RKU941.jp.fujitsu.com (unknown [10.124.101.65]) by m3051.s.css.fujitsu.com (Postfix) with SMTP id A96D7128 for ; Mon, 2 Oct 2017 17:34:44 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v2.5.2 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20170217-enc X-SHieldMailCheckerMailID: 1e03e414446146858bbd1e853fa3a7f2 Message-Id: <201710020834.AA00001@WIN-5MHF4RKU941.jp.fujitsu.com> From: Tsutomu Itoh Date: Mon, 02 Oct 2017 17:34:12 +0900 To: linux-btrfs@vger.kernel.org Subject: [PATCH] Btrfs: fix fs_info->flags value MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 X-TM-AS-MML: disable Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because the values of BTRFS_FS_QUOTA_OVERRIDE and BTRFS_FS_EXCL_OP overlap, we should change the value. Signed-off-by: Tsutomu Itoh --- fs/btrfs/ctree.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 899ddaeeacec..566c0ba8dfb8 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -717,12 +717,11 @@ struct btrfs_delayed_root; #define BTRFS_FS_QUOTA_OVERRIDE 14 /* Used to record internally whether fs has been frozen */ #define BTRFS_FS_FROZEN 15 - /* * Indicate that a whole-filesystem exclusive operation is running * (device replace, resize, device add/delete, balance) */ -#define BTRFS_FS_EXCL_OP 14 +#define BTRFS_FS_EXCL_OP 16 struct btrfs_fs_info { u8 fsid[BTRFS_FSID_SIZE];