From patchwork Wed Sep 20 09:31:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 142308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4002493vqi; Wed, 20 Sep 2023 02:38:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTcmpqwmlXA7A3KpfJEmOqEpG13lcUbrREPan7WH8EMN0YrLGMAq2wwW2Cbnysdc5u7ZOV X-Received: by 2002:a05:6a20:d38d:b0:134:135c:5a23 with SMTP id iq13-20020a056a20d38d00b00134135c5a23mr5559869pzb.18.1695202738727; Wed, 20 Sep 2023 02:38:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695202738; cv=none; d=google.com; s=arc-20160816; b=M8Bkc15LbXsLWbPnuV0I0mxbFkbzDmCsaQJWCvmsozrXzzGOa82rQrOdeKazpxLHTm e3AgLwoqoequOtIj/tVxOKAaJh3IWVDukjUXqTsIZkBqsfRyP8kCFevmcpKX5o9foNMC Ig1T3Q6ifwADFwu3J/7ISZJ5sL/THTX5Nmp9EtA9aKK6z56c2vX7MXYXP9aC/rQgRgYF GVfGGLYaTAifFW3Nuz33YSk1MfOX9rCLSQ5MXQG99kSYR5LagoPvnx3lrSB5Llb9EGCR unp8hbYDqLPHJhxLMBIJi1Wqheivpxw5Q+Vx/kBamidPeD2DAhO+xDA500ocn/XGn+AS bOaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :wdcironportexception:ironport-sdr:ironport-sdr:dkim-signature; bh=U4pfP6Ij1+tlO7/CEM3xx88mf+46tXX/pfTfyZl48Rc=; fh=ZBIeESkUb/iidfG45mvqtPm0vhj4bdZnQPzR057sc1k=; b=oYDR+IX8lQXZE9NvyndAERpojioESTiQgyinEZwFvxgMPJ7GD/ufjciuOWnwj5zahp Rbj7U03AfneXTixePKMewQw9faPd2JNqv+9XhfwQ1SS0vlAk6v5oXiBCwgCb0SFxie1Y dyHtlLkWpRKEH2QsdAs9ZA87pD/en3Hz0kbb0Yh04h4d/LlWebcubq5ZzBof7jUbOO25 PNjflrOGyveae2NAQj0ZER0woBS2q3mECLB2b4CHuzYdBHZ2iMTsqoyCaLvgw8kD3ANZ 5W8WHBncAIyr4QhXtpq82F6uYUBQ/D5oRTeBE7+t5upvMokmmgbEE/300tMHxQ8Ui4rg o82Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=G7Pak7Sc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=wdc.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id v2-20020a632f02000000b00565eb0b2e66si11213673pgv.864.2023.09.20.02.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 02:38:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=G7Pak7Sc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=wdc.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 93F7D8225F18; Wed, 20 Sep 2023 02:32:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234166AbjITJbn (ORCPT + 26 others); Wed, 20 Sep 2023 05:31:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234022AbjITJbg (ORCPT ); Wed, 20 Sep 2023 05:31:36 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CBE1AB; Wed, 20 Sep 2023 02:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1695202289; x=1726738289; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=8iVMZ37k3ebDLUhTpFcPxEFFHsyZo3NYBSCH5A0OsrA=; b=G7Pak7Sc+JuG6OMJ57tspIi+h+JVB3U0SDJfNaFcj5UN0ilaTZcvgJlZ ShxCIODDqg7iTM/fA0wa1BO616GAqkGKDmsuuOGuK8qEtUWNl3NkFxTnd c7Dac4Izz8qUhqmwR2C5UU6LXz5XFv59zD0mzLjKq0TnT/moRpdoJpzQz dmsxhaWHFtptsQJvSz5xLsX5Grr2lbaCeIwz/rTpH3q0eAv2c8FUYj46i 9maYBFmu+8pZd34tMI/NFRQ7EOhTb2muFeH8toL/7UBK8qVyDA5CeHvkQ Frj6VNCljQ+rEcKLZCoA59lQL7bQczUd52STG4jhIA+AEJk4eK5zshIoz w==; X-CSE-ConnectionGUID: WSxBuEPGQOKA6+++Iv+Gfg== X-CSE-MsgGUID: Jk36h8bVTpuMdpPx6dXBjg== X-IronPort-AV: E=Sophos;i="6.02,161,1688400000"; d="scan'208";a="356502800" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 20 Sep 2023 17:31:29 +0800 IronPort-SDR: MMjB/6VvgiF8t6Ko0Xa+LkEhxPq+6twTYPPUwXqIOkWWyCA/qL1Y57mM4jxsn6UMdT2fMWVZWQ /f0CUlKLKRWskB5lZVf847YGjfOuuB7cHdAgUNHjVo+BXnbmZik5ErduCMHH9UJi/yot7+nywB VLcTNgK8SL/t7YnMmLaEpDGdLqTMF0b4Qm2gxJyJhdzEpTHDWI1XaVuHGV2MDSO1fCa5ZCsF5L pLrJn34dD66VI7E7nV1RwU7HOF/36dqgI9bOQmXh5dgQklLV2Ka3uKIZe2LgdcKpVEth/kP7wE 1rQ= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 20 Sep 2023 01:44:04 -0700 IronPort-SDR: 9zEHcTSQyQAe7+FWjnrfWthoNTS7foNY/Tgzg3SebtkBTXOEY0nI0AnI/wbF/JxJYkUOqoxG6b U1tVQQkubtgWUoWV+R9Q6o9g2gw13+fFWhk9SnFMw2+6PWmznLC3XgglUnec00BsQYMlq6g5ZD q5sZoJT/S1itbmrmF4B3PdqoCQ0yk2SjoPhzFRp/vKPrBy15Go1L73KEDYLNtlXc4FAcMnZB5J k8ZiILvU4+2yWFzwbC0uyKCfCa+9Y6ELiItiKCDtmEL4oV++Idb+ZY9EFtqO+O7hK9L6SX3jDt O8I= WDCIronportException: Internal Received: from unknown (HELO redsun91.ssa.fujisawa.hgst.com) ([10.149.66.6]) by uls-op-cesaip02.wdc.com with ESMTP; 20 Sep 2023 02:31:30 -0700 From: Johannes Thumshirn Date: Wed, 20 Sep 2023 02:31:18 -0700 Subject: [PATCH v2 2/2] btrfs: check for incompat bit in btrfs_need_stripe_tree_update MIME-Version: 1.0 Message-Id: <20230920-rst-updates-v2-2-b4dc154a648f@wdc.com> References: <20230920-rst-updates-v2-0-b4dc154a648f@wdc.com> In-Reply-To: <20230920-rst-updates-v2-0-b4dc154a648f@wdc.com> To: Chris Mason , Josef Bacik , David Sterba Cc: Qu Wenru , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Thumshirn X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1695202286; l=714; i=johannes.thumshirn@wdc.com; s=20230613; h=from:subject:message-id; bh=8iVMZ37k3ebDLUhTpFcPxEFFHsyZo3NYBSCH5A0OsrA=; b=mpEu1QDAPPZk0hKGOfkY1c/HD386Rd9soVUB+8AnTBwfd6f5GwIRPKlvUTodh77eF+ZgWdlfq +9dtoDCqNzFD9ANHnWagbxGDjTWqedSdVW4WPTw03XU0NdRM0/29Kj/ X-Developer-Key: i=johannes.thumshirn@wdc.com; a=ed25519; pk=TGmHKs78FdPi+QhrViEvjKIGwReUGCfa+3LEnGoR2KM= X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 20 Sep 2023 02:32:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777548907025051989 X-GMAIL-MSGID: 1777548907025051989 Signed-off-by: Johannes Thumshirn --- fs/btrfs/raid-stripe-tree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/raid-stripe-tree.h b/fs/btrfs/raid-stripe-tree.h index b5c64974e702..cdb58b38fcb5 100644 --- a/fs/btrfs/raid-stripe-tree.h +++ b/fs/btrfs/raid-stripe-tree.h @@ -29,7 +29,7 @@ static inline bool btrfs_need_stripe_tree_update(struct btrfs_fs_info *fs_info, u64 type = map_type & BTRFS_BLOCK_GROUP_TYPE_MASK; u64 profile = map_type & BTRFS_BLOCK_GROUP_PROFILE_MASK; - if (!fs_info->stripe_root) + if (!btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE)) return false; if (type != BTRFS_BLOCK_GROUP_DATA)