From patchwork Fri Nov 3 18:38:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Burkov X-Patchwork-Id: 13444902 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3A81C4332F for ; Fri, 3 Nov 2023 18:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233934AbjKCShp (ORCPT ); Fri, 3 Nov 2023 14:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbjKCSho (ORCPT ); Fri, 3 Nov 2023 14:37:44 -0400 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0B6D47 for ; Fri, 3 Nov 2023 11:37:38 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 8832A5C0100; Fri, 3 Nov 2023 14:37:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 03 Nov 2023 14:37:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bur.io; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1699036657; x=1699123057; bh=X5GHwnNCuZ mOSDtt7+tvXysu/XAD28WLwLD+pyUhark=; b=C26VT7S1rYMLaTkvctRjrxrVoK 9LjrNHa3FTBttoe1neldMWmBgHQtuhfhEGDi2qk/MwFvsvemlgAldDcWXwEZMFrs qUjy5nil9xqihyO4QbCnxahVWNiS07g+sH8irNNy1AliFWx81jfAqZ6+/oCTspXi JA0x6IpBHxrBPl/xbskn2poo+IMRKnDRTVadkr4Th5DlbLgNNscEpdrVDi4mfL+4 Fox89fhzjIByfzMuziU4KRPd2PZsxUx5hzBHK3X2VpkTei8su7cCn4kTsaT2ZysB nZ7YDU8QM78OGahVw6Wmy50a8BKEqyWUQiQ/9aPUAwuxRl/tGpHwxo6egdpw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1699036657; x=1699123057; bh=X5GHwnNCuZmOSDtt7+tvXysu/XAD 28WLwLD+pyUhark=; b=s4HYZUMlNCNwNkNNrkdc16ANqsefwXIKepZPVhNuOVVJ N/7MGut3DGcvmCJ1pDWZYBJDCFsogcM++7WBj2TMCfBLxGLvDZuWOrHY3rawqWVe VXkc0gar1Sz0zLlVC53T/sGDfgpVyW+XdfKkxG6k2Dz6Yo9dxD9ye5jT32RgfU5+ Hvsyp4WVy8IyL1Mt0dXCcjt1Ezz8gFJki5L+q6hyAEi7ezDNJ+0x+2RJQ4ysEmx2 HoYCwHtxAaf596irJowE8xOt513JfYNH2bvPhARlISsIRZBvz3zsMVUmkAh7ZOSb uAPXgiDUmJSX0z3jH3hHjRIVBeFS5UyuGjoRcSQN/A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddtkedguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeeuohhrihhsuceuuhhrkhhovhcuoegsohhrihhssegsuhhrrdhi oheqnecuggftrfgrthhtvghrnhepieeltdffhffhvddtfeegvdeiteelieejjeeitdfhfe egkeehveehkeejleekgeeknecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsohhrihhssegsuh hrrdhioh X-ME-Proxy: Feedback-ID: i083147f8:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 3 Nov 2023 14:37:36 -0400 (EDT) From: Boris Burkov To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH] btrfs-progs: make OWNER_REF_KEY type value smallest among inline refs Date: Fri, 3 Nov 2023 11:38:57 -0700 Message-ID: <868ac4f8b351773d755e6518c6afa525371b1c56.1699036579.git.boris@bur.io> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Companion patch to progs for the same change in the kernel. Inline refs are expected to have non-decreasing type value but owner ref violated this and got away with it via special parsing. Fix the inconsistency while it is still experimental. Link: https://lore.kernel.org/linux-btrfs/20231103134547.GA3548732@perftesting/T/#mca2c0e21ecb7a0da616dd09980b9f008c3c00f63 Signed-off-by: Boris Burkov --- kernel-shared/uapi/btrfs_tree.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h index dd7593634..e2ac228bc 100644 --- a/kernel-shared/uapi/btrfs_tree.h +++ b/kernel-shared/uapi/btrfs_tree.h @@ -220,6 +220,9 @@ */ #define BTRFS_METADATA_ITEM_KEY 169 +/* Extent owner, used by squota. */ +#define BTRFS_EXTENT_OWNER_REF_KEY 172 + #define BTRFS_TREE_BLOCK_REF_KEY 176 #define BTRFS_EXTENT_DATA_REF_KEY 178 @@ -230,9 +233,6 @@ #define BTRFS_SHARED_DATA_REF_KEY 184 -/* Extent owner, used by squota. */ -#define BTRFS_EXTENT_OWNER_REF_KEY 188 - /* * block groups give us hints into the extent allocation trees. Which * blocks are free etc etc