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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26C1BEB64DD for ; Thu, 20 Jul 2023 08:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230166AbjGTI6Q (ORCPT ); Thu, 20 Jul 2023 04:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231251AbjGTIvD (ORCPT ); Thu, 20 Jul 2023 04:51:03 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D513F2686 for ; Thu, 20 Jul 2023 01:51:02 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36K3P392027473 for ; Thu, 20 Jul 2023 08:51:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=M+8rU7JcBN7Mx9Xkj/4YTz1JWCy8qWczZp1pmfEYXLY6NWie+u1OIr5xbHwbjM7MxRt+ itzMOm3G32pGbxmslst0H6MDkw2IRgWchYD9QG9aB6CMNR902suerlWv4qQJQM134Zp6 EIGcMbx1JspXSobJB6XPZ5ScVwbYDl5YhlCQC7LrFjA3iBldZSTndAQkqhbzbiLum3/t b4yneNt+8xRad+vXg6gPgsBWuGvagIp5djLh8qNIcCqnmhTeQaZNUNNtaA9V8tDw2A/q PW3rpT6Bt0LIJDDFKV5rrmUf0l98QwgRVXqwYZwUPOsE+Zm5cHXgA6afa4HA61mMMWbl YA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run8a1cpj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 20 Jul 2023 08:51:02 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 36K7EiFo023821 for ; Thu, 20 Jul 2023 08:51:01 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2174.outbound.protection.outlook.com [104.47.57.174]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhw8k7xw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 20 Jul 2023 08:51:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KZTiW8b2hMqV7BMK74pOZVU4rX/JbuQ6WqK7DRSSFdZGHNTnwQYML5dK3coxd9ENXrBZMtjFTfqIUL1NKgQhVatBkK4ytVX844OEa42EDh1om1zrNfnDrqVyrJoYHb81XHR/s7BqJ7PpIlLdCsx9SXk+PAD3BLF/ICmEAkuz3ZjVTlJW4maMYzGQu33zzVhy00X24xUucyzlSCX0ULtzkl/1Rc5KOsfpAZwsmsrGBGpC8vtSE9zEfV6PIcPduotPE2zL8sVtk9RIVUMjCRn9HrRys9wwQzmC303hIGEfxCoOGCYX3vERUxtlspKnxmVTQPBLTHuWHUciR+mzNnc/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=LERe7rc1G6ZNe2QI7QywPCaPkDgcX8wgw9TaLlLMC5Z2sqLUKosXPE9VcVfMIsk08QeIuMaB709JqQrLcFb4sSZOuvEmjYtB0/ZIy+CitJUBQDoZ2tXcLNX0v0Ksg1CAhvHpC3D6tlV54V4sIWURCBDrjEOb0kT0aIuy3Q3QAZW+mlBuIWCFH/hiuj4ryWKeyixMjJezBFRU4ijTYCNpxXDqe3xihhVk8pRpblWEfw7+uZK1gmiJKBpQze/CoVRHkMUVT+/SuQworWr46NCQR95Q/FOKi8aMt2Lv/9eS3C8fhcMIjSrhM5timBBs2Qu7v693igf4Sos6Z9wElrTn9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=lUPVTkVoOqktRPle4X5hH51B67H7FJkTgod6p7ZAyJXQmxhMlNeaqtyjZ0BhiklsRm5NQlDdeD9AVrvWZq9301TrusnPSTWtC7NOVbrAYiejQvyL8zu0LWiccxuw8jbUQuu1zpA//S3s4mLei+HOa1lcrI71ZntVKAoj9zswP/I= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by DS0PR10MB6823.namprd10.prod.outlook.com (2603:10b6:8:11e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24; Thu, 20 Jul 2023 08:50:59 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56%4]) with mapi id 15.20.6609.024; Thu, 20 Jul 2023 08:50:59 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] btrfs-progs: dump-super print actual metadata_uuid value Date: Thu, 20 Jul 2023 16:50:44 +0800 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI1PR02CA0021.apcprd02.prod.outlook.com (2603:1096:4:1f4::14) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|DS0PR10MB6823:EE_ X-MS-Office365-Filtering-Correlation-Id: f75e883e-8cd8-4248-afdb-08db88fe7029 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3H4DsJgZWgnC6+Ij/Hpxjan7oLCzECqhCY9Ad+89mY8nWcYxWJfwiIUFNlvGQ02lUTaKh4pZ5ff8bZkGZoVDzMUrIGiCZfAEFYtU2Ti9L24Z/G6BFmXvgD8t7UM3ZtwM47U6hbjDHxASMns6MH3D83+dviOujGztvE+BDNZpxNskscVAUnwKiCF8o8tvKkjJSHS5EbSkdkk+5NoNvWmCOItnpSlbg7JXXpVv0JfGTdAVgZ6LIwEVwTEEbhGGRx/flSFvRLpSmd6RGaltrHWBm+9fLWzjjAnriXJKYYiFKM32Ax3KRHaqOtWciDs5rM+Xgfz6Q8CoPSFe3IhIv107dk/7j1AD4YWaVaLB0bbpgoV+Ce4rG/7NnfKbAFdJD7qj39aBwuzWBcI2qGwD0nRiGUi9qUgqCvi38TLbuKG5nocuiIU/rK/aaXFuxxyZAe2a5yJqLGp3Y6A4KbMdpi7KaNZfS0bV9l5W/UhSHzYtSzZ3Zq3raR6QbdGAAbzZW1cLijwWoOHCRCb2u/FlQCBxRXZEMiEMga0NBorqhJqvt21CcN/3Kur36Ha60viZzNxL X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(396003)(376002)(136003)(39860400002)(346002)(451199021)(2906002)(478600001)(41300700001)(44832011)(8936002)(8676002)(5660300002)(66556008)(66476007)(66946007)(6916009)(316002)(2616005)(86362001)(36756003)(26005)(186003)(6506007)(6486002)(83380400001)(6512007)(38100700002)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XZ4Wyv6RZ/L0UjBiZjR+ASYSKPHb08pJrwCe64mvCvchCL+94KgcKiMuKRyv?= =?us-ascii?Q?tdhIZVRfH9uZbRyU0YG5BAKFGcQ7J+9m1DU5XgiWbR7IotTT70opTTNgGziN?= =?us-ascii?Q?Vpljg85HlDGZ+W/pEsOshxtD3yJiLEbyldfMB5G0iSx9Sii5cpwZbNkZwDtV?= =?us-ascii?Q?B15HRXT0nJfs8hTTrEZfCZv+4sArpdxpRK4pQLzVwN4ldoP5EBWmIXUC1odz?= =?us-ascii?Q?uNWQzuSHzvgqVh0J1jJHJC9XVAmhLH5/r9zNwVF4qd37ZMn93D9Uj4KvNQf7?= =?us-ascii?Q?1lHxFb/yR2MCJSMU0QhjDO25jL7gZImem/2gEHGMK/zihIBYTklqBRJbIUhj?= =?us-ascii?Q?/2U/YGXPKss02SgtAnjwEivqHv0XDnWb8uaWZpStVzvBg1YQdFVhin1j2Tk7?= =?us-ascii?Q?fBFQdf4TW7Xoj8XRUyUFBiEUcrqpUeuY11612Wss091Edgsm0F11Cm1hViDp?= =?us-ascii?Q?r0PZNxi6n+9GnvpX7V3omYsazmDw62EMCZ8u3R789doUy6tLbMqOP5b5LWrX?= =?us-ascii?Q?V5E3vZoD+wAfzcd+3mMhQb4gF/dMFhO924/02RN2H6+YvV23fyzGyjLawK8P?= =?us-ascii?Q?BSzJPd2pRDOd0lAncNTfQH9m6a60qXPMrx9gANy3IK9V/vwJoqyeaRDGiZl+?= =?us-ascii?Q?2Rqjm5baRAAZLticNq74UKFegqnZp5ZDgpRb9ty3pGQjtWD3j2/P2NzMaspC?= =?us-ascii?Q?HrFd0IIBUUYryluNL5DL5DzNOudy5onHjfhfWI5CwhG6kj0bCkcmq7G9bEpY?= =?us-ascii?Q?dXE8K49KX6zYABKCGPrsg2fvRCjjf3U3Ihg/fj0J+67crzgHZlw+PDKsNp4c?= =?us-ascii?Q?0bG6iRyFFAS7MsS8FtxGLqeoK0uJLFfkYL3bYPyXDKKrHJK8keXK8+BQ1kZr?= =?us-ascii?Q?8Nj9E35VAC5NAP7GD8V9+u52az+WXBDNpVCpA3tOKHWzNqvhpkfC6SK7RdsF?= =?us-ascii?Q?kdVxSqDwn1Kyma0DELFE2H/XPeCZoUiy8VmjhSy7symvbYw0vwqfftar5qDr?= =?us-ascii?Q?5k+fPdmZb/6xeeXnI65oRd6TTr/8UOsJy/DrZnbCFZ2OXgSjNNm4aFmsfot7?= =?us-ascii?Q?RwtSGmBzLDF7La1FavGDtHN1mKgQc2YuDIcEeuzOmxL9ooeyEb6O7uFpeLOL?= =?us-ascii?Q?p6sX7SA8LuoAO8X21BcH/bvU8QpqPv3YKOMfW5Q0cJQ6+0YQXJ2iS1G7Tzk7?= =?us-ascii?Q?1dPK/3tma2t2Btp3j8h2mAHZZ6T1gmUQv3YAVoaiB3jWCMTUbjQc4TYrCcb0?= =?us-ascii?Q?8F3lK/6f2NG9zLAyMnbosFCfyelkbYTZLPbkn7QWyWmZWJBLQ+UxvHHNVHek?= =?us-ascii?Q?oa8kMNFfBeTPvgljxD4bgDsFJFcz9xI/sghtVOZeDwDOdlWorSET1e4dpCm9?= =?us-ascii?Q?3D0yNs4XW19gqb1cP49UWzYqZjsdDpohx+kNgiiQRDSWkHtu9XpYW8uCuLva?= =?us-ascii?Q?X1lyXFbRSucTUfIijqfnBkP9TvGY8WzPBecYhgMeqzu31kR+7JNZXxyxOR5b?= =?us-ascii?Q?KmM74Zn2r3JJbdLrM7Zp278Ag0YwmUT+LUK5UP1SlVtW/lyoX46qgx1J9s2g?= =?us-ascii?Q?FOKmCacmeTT2Z1+3r95KGiljn+tS6GHAhzT7GFy3?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: uY2nf6GerKk4kRhO6zq94DTsEONLXIoJSUM1AGFvADy6RrZjPywczTX4xB9yI2GPouc/zinCZZZc7Bq29jS9k9lAO7encM6SWZn3/dASeBBoW8fFZr8EBH6vddT60HQPH5/ypupgAgYZ8RZyUuPpcQDVUHfZLvLLD+ZdMFxbj4u6g4FDYOXpPcNllpJHJMnSGeMqVxSlsEu4c+W+sO0jBsaEY+NHA+6bFhydCnKaEsQeYoa63g65j1Hipgxj1YzWPf8rgPQNuXVPQifpMvMI4QkeH+dm4jTf35gFAvVohuHWZIaD+cW9S8uDmHJr1Ii+dCxDzouz0EgCYqBs0cOrSgQDC5uhHh0j3pZoKX7Q5XjG0XH6DOm92OedJt0q2pG9Xr1CSD6W82yy4U9Qr4tlqKThIOvJkeWpc3AMzCGWgo22VjTWcYXXieFJGkkoqZtk3/v8kmZtWZP49Dt3uh+pAWF3dqKpZ4KoC8k384HeZ5UxIPMqwGLQrERjgi+AUoT0NKdXY/z/R5uh3oFm5iaxBDdmo/2pVBIuX1JyjUUl6BLy3PyywNoCydywZI49Ysz3sJK6g+R2Qi8A0vxJLvqF+vH2LLANgVj19mEiplQY/kLOCpHq4H6MrFn3KYMDELCnCrp/X5aS8BZVgIdJ57nt99ST3TCOaSXcHJiI+YeYCZcn9eMemMkNG9kYEeyjcTHYRLIjUNN/CRq3VODcnvTHxqLFI/E+0FYLyZmn8tRa63iicepiFLilYY+Bs1IM4+RNKNicmxY5fae6rz+VWV3hlw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f75e883e-8cd8-4248-afdb-08db88fe7029 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2023 08:50:59.1041 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K7iEdaYQ/O+2XbPl9S2FNVGhoy7sb6trwRx9d9Im50FPQJ9yravKEpESa+1FYjmihQuLgK6ma/RgJrfDmQXLiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6823 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-20_02,2023-07-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307200073 X-Proofpoint-ORIG-GUID: bQkcG6sn8_6RXB9jtbrKjZCcF1tQHgqj X-Proofpoint-GUID: bQkcG6sn8_6RXB9jtbrKjZCcF1tQHgqj Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The function btrfs_print_superblock() prints all members of the superblock as they are, except for the superblock::metadata_uuid. If the METADATA_UUID flag is unset, it prints the fsid instead of zero as in the superblock::metadata_uuid. Perhaps this was done because to match with the kernel btrfs_fs_devices::metadata_uuid value as it also sets fsid if METADATA_UUID flag is unset. However, the actual superblock::metadata_uuid is always zero if the METADATA_UUID flag is unset. Just to mention the kernel does not alter the superblock::metadata_uuid value any time. The dump-super printing fsid instead of zero, is confusing because we generally expect dump_super to print the superblock value in the raw formet without modification. Fix this by printing the actual metadata_uuid value instead of fsid. Signed-off-by: Anand Jain --- kernel-shared/print-tree.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 0f7f7b72f96a..d7ffeccd1e89 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -2005,12 +2005,8 @@ void btrfs_print_superblock(struct btrfs_super_block *sb, int full) uuid_unparse(sb->fsid, buf); printf("fsid\t\t\t%s\n", buf); - if (metadata_uuid_present) { - uuid_unparse(sb->metadata_uuid, buf); - printf("metadata_uuid\t\t%s\n", buf); - } else { - printf("metadata_uuid\t\t%s\n", buf); - } + uuid_unparse(sb->metadata_uuid, buf); + printf("metadata_uuid\t\t%s\n", buf); printf("label\t\t\t"); s = sb->label; -- 2.39.3 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ABACEB64DC for ; Thu, 20 Jul 2023 09:48:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229618AbjGTJs2 (ORCPT ); Thu, 20 Jul 2023 05:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbjGTJrx (ORCPT ); Thu, 20 Jul 2023 05:47:53 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACC1430FA for ; Thu, 20 Jul 2023 02:45:45 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36K8pfWY013399 for ; Thu, 20 Jul 2023 09:04:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=l2p2OLzwOR86RBI40sVE2zTMt1OhMeP548t1KsKd7Cao/2lYB8my2uVPkZR1yaUIcVZD rKhcUjKeN2EgkLYD89RT9whQx9j8/CBo8B+D0D4u7ATQe+mxsOGLtEKa62kPVn/ssaSq V2p0gjegcCmhNpFu5+RqQWAsv6AmaoXEiiG0gWHpG2qeKCV7w4ZWgShrA9Otog0NHb5f Jvj5Z6RDMxwE2Wwtjc3WgqRcpm/kDA5VcZad+V+UtXrqtr1GHqs1JCXXbhhGlBJyfFvc zT7o/Vc2xfoYU+Y/p/Mi6Bkhmlmwky1+0MdH3tvzDafETjq8LRtExV1i+zG1Du93ZBhi 7Q== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3run771c81-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 20 Jul 2023 09:04:30 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 36K7RYHF023850 for ; Thu, 20 Jul 2023 09:04:29 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2043.outbound.protection.outlook.com [104.47.56.43]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ruhw8kp3m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 20 Jul 2023 09:04:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iu/QjEtXQRntB5prK1IfeKnLUOfBFk2KatTr7rWZh66aH3egCmOYf7DJm8Rprbwo8xQM/wxfIk/CdA4e2UXnULgPxu8UtI3QoM5OVnK7+ujeTUwFc3fH7blVPAOVVtu4Tv23W0rWjajRYk60VJ1E8rExFzZtjSgMHbYt+4jhODuyJXbfkBcQe7YU3bR+RYvgqEGnelS7QJBorVZ0cIOKgrfG9qnnaf5gahlu71j2J79I2X5fYiBFo00HpIZB0QwVYCh/CkS+TgIEJX1NHzZhmCvVHX1PoKKP8XullZ142BJ63Jq5BG5oe5wxaYLGQtly+lKgYKL5vhhQ0Y00qtBhgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=hiIJwE90RiGfTJP3RvdfecDxfe0wuQJbGTx1aIjFXExinYud1qGTBl23biDr4ogULyAOiY7YkSPcaMXyqukYoNNU44hmo6PcUi9ydOmdOi0osKFk+GpcEpRr4A3H1gA1QvQMummR0RT6ZccqV0FWYK5+05VNpZDn/n2WK5MmTKRNunAG9zd7VGtah/tbhoEXu+sEG7A63b+9eSjRnUiDCzw9JhK3dB8xEnFShytxrj0GVtjYxVmw2vZ9h9/xM/8ufGRvX/CEqOqsaYYw/jsdSd/FDb+Tj/hNn3qqZTO66LUgqdG9xbP/7VTgh9uNmw5iOW69uzGIJygLA6LBJ9i9ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=ZAj/i7wwecgi2BqCYmwAOE6Klq6oZC3JgE41uCVhkhbjs6dMtb7nuYLxMitow5V5moNJf8uuMeyriBqLT+PUGwzqjQKTyd2s/sCZd1O6YCw1bBHDLFS8yYCsqfcHIxEAhjpbrQkOyxKPJM0cv+HYJ1H6kNtLIwZO4PhsgaL1fn8= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by DS7PR10MB5181.namprd10.prod.outlook.com (2603:10b6:5:3a1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.27; Thu, 20 Jul 2023 09:04:14 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56%4]) with mapi id 15.20.6609.024; Thu, 20 Jul 2023 09:04:14 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] btrfs-progs: dump-super print actual metadata_uuid value Date: Thu, 20 Jul 2023 17:03:56 +0800 Message-ID: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2P153CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096::16) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|DS7PR10MB5181:EE_ X-MS-Office365-Filtering-Correlation-Id: 1993dadb-bac1-4ff7-b256-08db890049fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rtj3x74J1a5JzMSAtZtwKFTXtees2oW1AOEef1EdWsCCCG0Y3GolFemWjrUSpUrrws6/AfftnTyKyMCt9jR953xmtpJ1mVQmBaaWYofn2DaL9gzjHzsiMDTWC6IRQrvoo14fXRBGCmyzpx32zlbnSv6dyOtAcOI7Y5AenCOQrSDv+e5Pkw6/CJzax3gtFrbmIseslDTMfKwrTLk9fnCjIoOjBhoGVzcy/bHJ2VKoyUshwZP6ArTaaHv8aAn4HD6vrgC6SDoGVA7uuZJ2ILKHLd+S6m/9tqZLHIn/b2xvTnPFyMwwDpBY6ySzigzuPeo9c/kGcaAGy5qqcUL+w/ju4DBwNv4P/mF3KD1oHaJz9qfbnDLzKBRH1AoGvIvtMFxBOfqo5L9dVHb11BosR0Kz/3+4EtxB3Hymga6GG4YInNDXrQvWI4OYNdbwu88siDAghNcJ0VZzmi+Aw4crMhPaVlAf0jWyUQpYMt8P0gCylr+mRlJCLBfGGVazriAXdunTMr9rBybhPENcHW92M1xa1yOMHj2yehHAZ3bl32McKg0gxiqJtMdjrLLw1/pdwVHQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(366004)(396003)(376002)(39860400002)(346002)(451199021)(6666004)(6916009)(316002)(6486002)(6512007)(26005)(186003)(41300700001)(6506007)(478600001)(5660300002)(8936002)(66556008)(66476007)(66946007)(8676002)(44832011)(2616005)(83380400001)(2906002)(38100700002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mVd7OG7rZ+3YGdEsr7rMNG2E/l8UjKDUqr+AFqyb2lvP1Ny8rMeeIWMDdell?= =?us-ascii?Q?GnfJRrboAP0H3XPggnYN92keRl6R/5kASbJjP5GGHcOdpV9tQoIsUaM80iXH?= =?us-ascii?Q?zkrcINGCNQpvy+F8/oobqoG5mWeHLlK+V6aEUOtpZ7gHL7d27na/ijABsRGl?= =?us-ascii?Q?tfqhtJ+9kL0RJ2dtigaXEwmk0EggYtoEfrU+vVQ4wMaPDMbmbP6nBcwv5qMr?= =?us-ascii?Q?BtklC+48vU/4jpNASq2Ps7fMn5/GkS+psgZXx69RwuzvQf9cGpX5LLEbMdaT?= =?us-ascii?Q?/M/jFvyt3hNAxTf+92HQi08BJVOrYkvcQ18g/7gg0306A7KJZL+/2VtCzwMp?= =?us-ascii?Q?6MDHcodp0HSu758JnVyYM0b7B9J62TPJKN03I2SxYr7Mr7ADU+WAhY8vVcgy?= =?us-ascii?Q?rgitRzfoSOjqC4m5mBvAV1J9iLWdOiYHN7Qtqvqnd3WDnnSn+5xwhkd3HWsU?= =?us-ascii?Q?hpngaphCg8tKyfHdvetNNU+sS8ra2BSPdPiOx5g3bJLf79y9dtEXmmM456JE?= =?us-ascii?Q?mo/+yZBIK8/XQ5Ck2KjqrfZRj9fdsL/LLpfvuzpM2aaVGmSWqN01srXZmBsw?= =?us-ascii?Q?i+6z8j1fEeldwV7PAbZhUl6ViTmf8Lp17qGUVWvCL4vX6rNZw8qC56TfTAUQ?= =?us-ascii?Q?k7lq6UnsfmLMZYTCv1TUgPjAY3FCQYzWU5IHHj4rHgHAuHkmwRKmGf7Y43TI?= =?us-ascii?Q?q/XP3vkJD1LQR7uM7lUIlKeaLP/oS19+Tsnday45fkEt5HrajgBf7fSacpdK?= =?us-ascii?Q?/L+xNog0sLgcQtA7MA8PLGyHfmalOsvHxXJx7KgUSMw9Omz1JMZ5id+4ZpO9?= =?us-ascii?Q?Pz3qO8d0pCdZMZ4IBsri3u0UDb5N7o9gR7oRHnkgemKEEP8R2vClJu/fqfNY?= =?us-ascii?Q?0WKRQX1u/J8N2UN/T6SqWXUNuiO6LCKu0iIBzODjVc58HyZq7MjlFp6tyyuL?= =?us-ascii?Q?n3QMDK14fsiKaXXfBGx99+66y4QrMWPA2mmtRLFPydYiNWo+QU901DzTHiM9?= =?us-ascii?Q?syptxqBTdlBxXowkBTgGi1MlnG6p7mmyPlShuwjXzn6dP3YkD2NQstzqf7oq?= =?us-ascii?Q?HrOps1Lv0ulOGuxVKd0niaZZJsHBgCQybc1GYt2kfkznjcYk/HBW/MCobp62?= =?us-ascii?Q?A34pW/7wxF2CrV5kk3F2urzB7Z7hqRw1AyInSj+WXgMKdpjpMvs1EbY5DWln?= =?us-ascii?Q?7KIfrcnZGN51o3BHwOv41HIS3y1rzesoMqSxYiRrE9BPlPmcNV6Uf2v1w1eT?= =?us-ascii?Q?PyymYV42TiY0HrjcgswmX/u73RzTrg2CIHC/q+ssh33rZUwUNPfhyrjxOvO2?= =?us-ascii?Q?WVzzJ2Z/9FxOcHfVt8PkvV+4xStjTJH4GCKOcDytcoYapjj2/vvA6iGNwyM7?= =?us-ascii?Q?UrHqUCc3z9CA7sp9CdOp8KLXx6KJXCPKGQpmRm8kTZ4mnq4YasGpzxP3Cj3f?= =?us-ascii?Q?7NSGvSe/lxFImq8Yz+YMWd2kGi2VLTWTpz/xroDde0ULevnvzhTnK8Sk3hko?= =?us-ascii?Q?NxHfe2SEQB6NznmVmcwK+NO5Qwalkr7P+VK1/71gcK99AZvy6hy1dG9DX+9G?= =?us-ascii?Q?Pn+h6KntHwo44rynVJgoSjLqaJ5m5/ggDcbd+tEG?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6LWuBspPcY7lLHKOm5dIxzO2dkAxdl4I9MsYlZSmpPW6c0USp3AkK7v0n3RiXM13DDn4wKdNqNx5rzne0+CtLAg2gbHexHYiRh0N93Pq31fWQpf77LuIUjbn2RsSK3qLwhIqUFDggcj8zTjuw2aoScoQhHLpinHF6DOBgmGySHiIODlrunF4HGcDJXXtPbgMIUn4dfSNIjd2/PY2uwHIPDpTDr/HvP0wTFnYhwu+C0m3IOB87e2T0V7Ul394cwdhdotHda2/On90PFsfAYhpe2LE3fm6GUpbeH10/n3Q7BzcDYR0/08NMu3/xk49WHLKCtt9zBX06pWWI5IK+2PekQ947iCJMyW7cDL+FR+L9zWGpSZgLkIqDqvWj4H2RAdfifawG+T4fvd9oTcq8VH5HHpRkqh42sgLIP3KOV77LRBRYD/ZN0XnTkYFgk1GsOiemK3ho+kKitLNcgf2iGrP+x0XVZtXBIwFNppWG7ph3pek82LU3aH6Xg7Ruql824hQO0YeNG/do6zX5Afvowcxqy66d0jasjoSIiyUJKKcgd/4oJvURK9jdhQOLIOmYwgML/UHd4WjZmlsPoVQzh4QqOZqaDezJgWAywpSuX9V3ctR97Km9KlUPLfCNP1ac9EGlvI312hzRhH6AEHShRZp95bCF6ypRX/t0WXWBYkZBvu6eZVwgahLxerOkxujEixXHY0NUYIWVLnlvtbqtGJE0Q20WYWnEyot74cOw6QlI6K44NtSG9Eu+MP9DSQJDcTR3EQV/vkWLzWSHz7/+g098w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1993dadb-bac1-4ff7-b256-08db890049fb X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2023 09:04:14.0473 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nTWf3i0pzAB1GVSW3+KqIYxxC+JHN2llpRRDK2gMLiYi7iwozyWkxhaQbR8hku8U/R3ReWRT99zHn3+MnPg+UA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5181 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-20_03,2023-07-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307200075 X-Proofpoint-GUID: -6e4MlpVf31BlQB9KFglFup41-AZ6-Sg X-Proofpoint-ORIG-GUID: -6e4MlpVf31BlQB9KFglFup41-AZ6-Sg Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Message-ID: <20230720090356.FvZMx9RxXgI8In-Hz3mvsnrOwr9g9ek3Q92aW6CiS3g@z> The function btrfs_print_superblock() prints all members of the superblock as they are, except for the superblock::metadata_uuid. If the METADATA_UUID flag is unset, it prints the fsid instead of zero as in the superblock::metadata_uuid. Perhaps this was done because to match with the kernel btrfs_fs_devices::metadata_uuid value as it also sets fsid if METADATA_UUID flag is unset. However, the actual superblock::metadata_uuid is always zero if the METADATA_UUID flag is unset. Just to mention the kernel does not alter the superblock::metadata_uuid value any time. The dump-super printing fsid instead of zero, is confusing because we generally expect dump_super to print the superblock value in the raw formet without modification. Fix this by printing the actual metadata_uuid value instead of fsid. Signed-off-by: Anand Jain --- kernel-shared/print-tree.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 0f7f7b72f96a..d7ffeccd1e89 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -2005,12 +2005,8 @@ void btrfs_print_superblock(struct btrfs_super_block *sb, int full) uuid_unparse(sb->fsid, buf); printf("fsid\t\t\t%s\n", buf); - if (metadata_uuid_present) { - uuid_unparse(sb->metadata_uuid, buf); - printf("metadata_uuid\t\t%s\n", buf); - } else { - printf("metadata_uuid\t\t%s\n", buf); - } + uuid_unparse(sb->metadata_uuid, buf); + printf("metadata_uuid\t\t%s\n", buf); printf("label\t\t\t"); s = sb->label; -- 2.39.3 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 001ADC001DF for ; Tue, 25 Jul 2023 08:25:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbjGYIZ2 (ORCPT ); Tue, 25 Jul 2023 04:25:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjGYIZ0 (ORCPT ); Tue, 25 Jul 2023 04:25:26 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A946E66 for ; Tue, 25 Jul 2023 01:25:25 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36P7oZ7p026565 for ; Tue, 25 Jul 2023 08:25:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=e9Ft6zgGMXC3ZISGxFr4EUSjCdFJlPbKw3EJa30E9nejY0vwBsw6NHYA+NTcCuBl4OSk mrxFtbY4nS7tAT8HsseX0qWe795z1qzjRuLRmHg4bfZ7NlxE3m1hWvYM5tLr4ZcOpnNa 8MhR1jUoTaCLigUwtUElaKLItDMdI4joQUI30FLcwHGptP/n70HfulJ+k5PbD1wgya86 Cn2OSvUECYbadlhS0eDp+I1/W6Pepdv79rZOWLFo5DFVDKTDblh1RTqZ8DwmuBFXOS8g h+eodZh66cRboLCofyYXvQo34bMM5FKL51Vue9x7tK5cKOLSNTFfvQu8QM7X/yt/x3mC /Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3s070avh0x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 25 Jul 2023 08:25:25 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 36P8IWfo035501 for ; Tue, 25 Jul 2023 08:25:24 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3s05j4f1h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 25 Jul 2023 08:25:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZAc2K8yPaLQPfEP8sGFmL5H3G9RDITvgW0hAfxOo0f+1iYoE34l8W3PGFVKt6VHFVDJStPo9xWptv5Af7zK8p4lT5ER86hXkEvJ5fQ5IA1M8XdCtbWATfoKPmsv7ppLcKP/sZT5Ntw894MZsrDgu31sbyJp16EKviYDlLovsOj9qPE/t43i3hpXywvhV0M4ty5FgAmsCi4k82KwFPuZI8nIcx/k28bVSNS8jxwNEA+pwqaxmTz2b/EFujn65DW6MSMARMiQnn6cVpdrd6mGCA7S3cA5IzA7IeV47Msy6ttfW8S6vZnntVBkmY/lUR1AhrnqHsEpTNVc9yJOCnmuBHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=Wf5b1grvrVa61AWo0Rr12wXsPJkItR0z2fGNCxnsGeUHrGdk51jyp03JFyam1Ky3Zlsh7bCjWw7rwnsFNmRuRCB+iV5ATNaDY/7JQO7iczQMHC7yndFhsG4q9VxoqtkdtDqP8ETiXx5iAYJbqkujenDQ4gDYwUeXzKxM/gLLiUASd29C4JR124pfoZKPPMY4F9Z708j+ocqyQ+7kU1HXdM5Z1J7KwvXUQkUivx/iE40IuvvQCW/2K73F3Hfm2CA/5twzkReZ0sroe1ZbBLm/9ty+ZgCObVxdXNoDBjAgciwQtpUc8O504+Fm62WC765fSxQJdJ12DtqVbZL56zLMQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMU55l4NWqOa/I/9JS2t2xTJlmX/6PRPJarAMJkOK8k=; b=uoXlDcq00nPPwXhFcb4h8kksjUCMf0+BvPpSDkN1jRd7MV/IdHrFR/9sf4RRQo6fBndXT6AHYenuQXMoVp7g8GLCmFpFJnzAbIzWixvzVBhHDr1rwISl5v+BOe3QZKqfEJeCdj6PBGMX+UPZpP+fZx+kEWsinDvYo79qO6WMLjc= Received: from PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) by MW5PR10MB5876.namprd10.prod.outlook.com (2603:10b6:303:190::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.31; Tue, 25 Jul 2023 08:25:22 +0000 Received: from PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56]) by PH0PR10MB5706.namprd10.prod.outlook.com ([fe80::b3cb:e0d9:ef96:aa56%4]) with mapi id 15.20.6609.032; Tue, 25 Jul 2023 08:25:22 +0000 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] btrfs-progs: dump-super print actual metadata_uuid value Date: Tue, 25 Jul 2023 16:24:13 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: References: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGBP274CA0021.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::33) To PH0PR10MB5706.namprd10.prod.outlook.com (2603:10b6:510:148::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR10MB5706:EE_|MW5PR10MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e8e5819-70a7-4d0e-ce28-08db8ce8b06f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zY+KcL8O1kf/fRFmVMCK+EsRLQ8T8r+pJpMMhRqSgtmLbkSlAejxKWdPwfV0kw9IdZwf9KytNj642Zq3M/JRxzP27rAPvooAg9ZNUP5hwja4ymXYFyyJwDohfKtusHpW2WjaR8SNtMsJkxzcXUI1cKeZe3f3yS3GEFi6NGj6OmOf4+Sq8PDIKAQZPNRWLxzVhddz1mwFJj1eOcLk0Xw96iJ4t+Oqc9RkGOHkoEEpQa2/aOf6Z3h7mcEzC4opneO69+pj5ZyDZO+m3l2F3rXn0THy8PX+kPuiOEB6IP5IUeLzUvC7m7x3fE89ItgservQm9O/mhPOor51JibOmGow9RNJPyMrvCyXhzLMowIIBRSwuyzPhVsFGWjppxMGjv/JhhBSXt/RsUulhmNMhNQV1I3UKqsXzc3mmlAE60laIL2N4r0sv9XG5boW6f8HPLWiubTdb4F+pDpG5aQxzULjbmUuMB2sGHJf7BnlxwoDdy4e98QlR0fOlxuYFr74WGcMvJk267kJx5ttsgKPS3mcwqZ2D4C3M8KxdSHUOWHPcwwjluMMr4+pI2R20RiHn9O2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR10MB5706.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(136003)(346002)(451199021)(5660300002)(8676002)(44832011)(8936002)(316002)(41300700001)(2906002)(478600001)(6512007)(6486002)(6666004)(26005)(6506007)(186003)(2616005)(66556008)(66476007)(66946007)(6916009)(38100700002)(83380400001)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KJiCUj6ZdyynjWXbD1BZsC6kIcskOEAk5SpOS3dJZ3BLqaOvLwCWxRIxm42C?= =?us-ascii?Q?xEiJf2SpAL162RXtOWPK4yuE1vC9igStnbFOrtCj/YTlkgcNs0uaIsL/gjyl?= =?us-ascii?Q?d8e543yneMFtATmeO96dSWD6ulNSdAO9kZ3pxWeyuCs/kYNK9xOydBPAsiVn?= =?us-ascii?Q?a0jQV0Nr6qTJSTPmndM2XRFTvZSNXE0lmFA2dlIs6UO9uC/RwjufA6ByNS6h?= =?us-ascii?Q?O9Lb7nqgTuM0MkeCLtkRnGwo7uAO7MrgkoD6elUI7S8P7eAuqzvmqSpNXmrg?= =?us-ascii?Q?LEDRq4pUNBBysjTjNbncBMi/HbGQjiq3/4xS5XVV1xFz0ZRL8FoMaYtOf1+H?= =?us-ascii?Q?2MAVD9SZJk0SvtC8QK6EOimuFfs2ghHXma80uFLtsHvR2wbGyHgkrCPOyfbL?= =?us-ascii?Q?SF81BJKXiUjua7dGv+W4tXl0cuvO9ICoc58GMNtaSd8jhFeTuUqp82HjHzY9?= =?us-ascii?Q?8y7ZXh+CBRAMfmQvJ9NJvBCgmlMnSweJfsOP/T3pXUDSwYapR+6u7PKhCOi5?= =?us-ascii?Q?u2mxTietPceO0wsHX8I2syjAZTgUKXjghBJHo4IvF9wNBVliI4Exrn4YYl+q?= =?us-ascii?Q?iHUaydk60FHugdLiuyr+QSzPsq7xBQ488aqtIz5GTz8yrG1zlMqO0wN4qD+7?= =?us-ascii?Q?wZsTXMXsOm7wYIixZp04kKzQA1Sbn4RUx5XOGfFn6vDPd8FxJA7pMnFEc/4L?= =?us-ascii?Q?JNzjs85ORlGOQR4m691a4IfLAbWwURr12TgXYSV1P1LExhZMWnij/QWeTchV?= =?us-ascii?Q?ADYG6yFi1/wM45BDiKckXCtp5veFwFnRwkZM4yKbfRlNru8hHG0s4TloPpRb?= =?us-ascii?Q?Lwp80/80E+WW9u5Wom2z5sMi0HuhZlSPGI1L9PrVbKQkLGqt8luXK3HeQCAt?= =?us-ascii?Q?9iz0GDbm83JQfDwzA7Ex+NQHcv859FNgAYoTN6XotGruv/dq7JrVw1lFkFYd?= =?us-ascii?Q?iNY3PF4Twj9Sk3O3/VuETNkpVVtsnFO4tXeIw+fkscB0WQp01cuJAWS/lL3k?= =?us-ascii?Q?9eBULPsA8jNTjWq4G8ZzPG/lb0R8WYGKnNtflEu1hhVjEzQ5LUbUgEwkX4Ya?= =?us-ascii?Q?zGFRegn6WMU36cdA73zTLFJMh31gTu8UqgxQ7Pau2RlU+qXbjTumkRlptIJ8?= =?us-ascii?Q?yaBx39YkG0amfPMWlS19DF3B0G8wUx1ZZAwog74lhLP3rt0PxPLLWY/8xJO0?= =?us-ascii?Q?oJqA1QnS0NGM9bt/oFAUsGSy4bsomH9M3Cxf1XOnm5yL80VDwMF66vxlB6G4?= =?us-ascii?Q?LqUI/QMxM0RVD9p2Im95/05Vban1zrTaMre0JmVl3yjZzH3G6MEl1UTcioxo?= =?us-ascii?Q?8ajjYfLDrM51sY68b5QvLvNklkZeQiwPng7HX3alRRnlPUICkBpgSf3w3cgC?= =?us-ascii?Q?uGTF1WHuTzFPhNBGG3IuYUzd5sLDGzqpJHmnQtpBqhPmVnpVSHyesCWcDvrW?= =?us-ascii?Q?huUKN4xxCsjeCZPsFj9sUvdHlPfAg69FkITpF3oyRyVX/deqKt/EJgs8wd/3?= =?us-ascii?Q?DXJMIsWT4yqrsZotG1IkH+AO3eag6d87LSZx+vuLfdl1JD+yHr6w04RmS2l7?= =?us-ascii?Q?/lIolIxBpMh5aXOomaGdCPgIJmR6yWsoH2yzS4rq?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: EI1fOm/UDqA+YfGnApP0OD8yU6th4AuLSrYuM6pAe3vxfEu3uHeUk44z8zjxc8soKSwDcYiVWVgkqhaY//ZEq+B+3aCvM1ghR97lcXYqupB1tmmrhg4k1LdFGqP2hO2SsLWDEdyxKksVj+ISIFPSr6r9S/xYb0CYCtPaeBA+H7hXtWEY2wkSK/GkB0RWsofswnEMtLDC/hjLckL/dmamPn30C/vthrS8N6bM2IuUFA8Ay65F5VAkqh6HUkdAha7R0R48yo1ti3YDbNad1OyvFv2w6ItAzwdBtca3NrWsKG2mRwKLsPSX/n1DB4fQ3mYBxtoyl2M2FFstgfpTaWMdwh2U0mk37PH5CN5kvvbvxDEGSGdnMCWn6uDBffWhKXEJhCkwc3YCIwXn+d5mO5vGvg/BPUS/bXv6viYI5hy2YQJbi7vkR669ttBOS4S/vI0XawL3ulA6gpgX08L8x/7mIvxL2/TDIU79wM2Tzi6ujFNd3fJl2XjHkDsQBBaoGAVC2DP1/vCqWsksJj9IRTc3nHqq8gofxsSBTV6xJxGz2NzFtdPVQgx78EPl8w/FNIMlt9fq0M3Vn+8Ah1HcXSlCZUziAY7voN/Gpt39eJs3BJahpwjGCHiQ8noMQZys7gPvwh8niZEygj3gANd/4P8fPLP/iG2NTy2XkaIfDxgC0Ezn8c1o1da2LgjeeDOVrFFVqy5jYc2mYLJPzZPqP09m62DGvJJY3TwkZg5XpYB+L+up/OyZIGqDy/3myha84UuB5Cc3XtvqsZEy6mtrT81oBA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e8e5819-70a7-4d0e-ce28-08db8ce8b06f X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB5706.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2023 08:25:22.6751 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Nz16t/u/Xw7uKz6MLvBHMKosav6U506rZOQ7PvnGmi9rIMpIs0WKAIhXNpwizIHYdFKmA29+RtIsWqGPCFAWRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5876 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-25_04,2023-07-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307250073 X-Proofpoint-GUID: jLRiaQQGopP8g2ee4pKwO_0A1rMkNpA5 X-Proofpoint-ORIG-GUID: jLRiaQQGopP8g2ee4pKwO_0A1rMkNpA5 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Message-ID: <20230725082413.CDnjk-hrUfFHQ2YVy5NN-O9jFz5g6A11RQOp316HdCM@z> The function btrfs_print_superblock() prints all members of the superblock as they are, except for the superblock::metadata_uuid. If the METADATA_UUID flag is unset, it prints the fsid instead of zero as in the superblock::metadata_uuid. Perhaps this was done because to match with the kernel btrfs_fs_devices::metadata_uuid value as it also sets fsid if METADATA_UUID flag is unset. However, the actual superblock::metadata_uuid is always zero if the METADATA_UUID flag is unset. Just to mention the kernel does not alter the superblock::metadata_uuid value any time. The dump-super printing fsid instead of zero, is confusing because we generally expect dump_super to print the superblock value in the raw formet without modification. Fix this by printing the actual metadata_uuid value instead of fsid. Signed-off-by: Anand Jain --- kernel-shared/print-tree.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 0f7f7b72f96a..d7ffeccd1e89 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -2005,12 +2005,8 @@ void btrfs_print_superblock(struct btrfs_super_block *sb, int full) uuid_unparse(sb->fsid, buf); printf("fsid\t\t\t%s\n", buf); - if (metadata_uuid_present) { - uuid_unparse(sb->metadata_uuid, buf); - printf("metadata_uuid\t\t%s\n", buf); - } else { - printf("metadata_uuid\t\t%s\n", buf); - } + uuid_unparse(sb->metadata_uuid, buf); + printf("metadata_uuid\t\t%s\n", buf); printf("label\t\t\t"); s = sb->label; -- 2.39.3