From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B119C64E7B for ; Mon, 30 Nov 2020 20:07:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B9AA20705 for ; Mon, 30 Nov 2020 20:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728899AbgK3UHa (ORCPT ); Mon, 30 Nov 2020 15:07:30 -0500 Received: from mx2.suse.de ([195.135.220.15]:48088 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbgK3UHa (ORCPT ); Mon, 30 Nov 2020 15:07:30 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id EF0EBACC1; Mon, 30 Nov 2020 20:06:48 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 615D0DA6E1; Mon, 30 Nov 2020 21:05:17 +0100 (CET) Date: Mon, 30 Nov 2020 21:05:17 +0100 From: David Sterba To: Boris Burkov Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH v7 09/12] btrfs: warn when remount will not change the free space tree Message-ID: <20201130200517.GJ6430@twin.jikos.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Boris Burkov , linux-btrfs@vger.kernel.org, kernel-team@fb.com References: <582a98333502e807faa9a899082e6e960e4cc0f3.1605736355.git.boris@bur.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <582a98333502e807faa9a899082e6e960e4cc0f3.1605736355.git.boris@bur.io> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Wed, Nov 18, 2020 at 03:06:24PM -0800, Boris Burkov wrote: > If the remount is ro->ro, rw->ro, or rw->rw, we will not create or > clear the free space tree. This can be surprising, so print a warning > to dmesg to make the failure more visible. It is also important to > ensure that the space cache options (SPACE_CACHE, FREE_SPACE_TREE) are > consistent, so ensure those are set to properly match the current on > disk state (which won't be changing). > > Signed-off-by: Boris Burkov > --- > fs/btrfs/super.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index e2a186d254c5..5e88ae69e2e6 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -1912,6 +1912,24 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) > btrfs_resize_thread_pool(fs_info, > fs_info->thread_pool_size, old_thread_pool_size); > > + if (btrfs_test_opt(fs_info, FREE_SPACE_TREE) != > + btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE) && > + ((!sb_rdonly(sb) || *flags & SB_RDONLY))) { (!sb_rdonly(sb) || (*flags & SB_RDONLY))) { Ie. the parens around the & operator, not (( )) around the whole expression.