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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 18695C43331 for ; Thu, 26 Mar 2020 23:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D772D20409 for ; Thu, 26 Mar 2020 23:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585265343; bh=ugF1C5/vF94YwU2OV9TAX2LV23Lfxd+eXmOauT11yTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tMCoX92UYxd1ZHzxmex8ZMf5iBi06z+z5TQuhGVzKHvJrsFOyIU9tt+CXWEUJDdUP Sn7Nzpw3Z2xdGhk+r8h6OCQ2vEMLTgyw7ZZCYDIbzEzhqjvyyuNcGrDJvZhqnAaiuK 4tM4wSrmR/Lf3+ZyMjfuCI9nuNJ6A9nfrbAR/CZg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728191AbgCZX3C (ORCPT ); Thu, 26 Mar 2020 19:29:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:44000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727867AbgCZXYX (ORCPT ); Thu, 26 Mar 2020 19:24:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6EDAA20719; Thu, 26 Mar 2020 23:24:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585265063; bh=ugF1C5/vF94YwU2OV9TAX2LV23Lfxd+eXmOauT11yTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ng01d3FS/SB7hl1mg7H5P6dqdR43ZqI+QKEy+OH/bk5xJxYMuEjOvtVKBlmCp8SrG n/Kc9p6/J1nyJ4sPjwrn4KiAbxtOWbpa+eWFi4KY8/0tyyVN1BFDUFBeNXGZmXZEgb NFTSl0eMPM4GGA4vA5w04v85ME3DNfKA6SzOfMEA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Sasha Levin , linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 22/28] btrfs: fix removal of raid[56|1c34} incompat flags after removing block group Date: Thu, 26 Mar 2020 19:23:51 -0400 Message-Id: <20200326232357.7516-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200326232357.7516-1-sashal@kernel.org> References: <20200326232357.7516-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana [ Upstream commit d8e6fd5c7991033037842b32c9774370a038e902 ] We are incorrectly dropping the raid56 and raid1c34 incompat flags when there are still raid56 and raid1c34 block groups, not when we do not any of those anymore. The logic just got unintentionally broken after adding the support for the raid1c34 modes. Fix this by clear the flags only if we do not have block groups with the respective profiles. Fixes: 9c907446dce3 ("btrfs: drop incompat bit for raid1c34 after last block group is gone") Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/block-group.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 6934a5b8708fe..acf0b7d879bc0 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -849,9 +849,9 @@ static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags) found_raid1c34 = true; up_read(&sinfo->groups_sem); } - if (found_raid56) + if (!found_raid56) btrfs_clear_fs_incompat(fs_info, RAID56); - if (found_raid1c34) + if (!found_raid1c34) btrfs_clear_fs_incompat(fs_info, RAID1C34); } } -- 2.20.1