Message ID | 20240325220724.42216-23-catherine.hoang@oracle.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show
Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 483C67317C for <linux-xfs@vger.kernel.org>; Mon, 25 Mar 2024 22:08:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711404509; cv=fail; b=dfr/mdt7E5tfA1J4pNenbP4unv1sJKSaHn5NOrHY2Mmn6GiX52vsyMAEUBxiFEY5TjmD/F8sjIzm8smZurr4N4cuM2XObsC0ooNo+fm6ekvXjEGpNGOfzIMihg2Yq6sg6+AG3Y6BElSCUp3JW7ZFYA2sV2V9mG3zS10n1oUTCgU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711404509; c=relaxed/simple; bh=6Xbbpl0CWqri/deCN1IRxkycOUv2kgFLzkS/S/LFC6s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YVS5DoidsiGTH8wwcd4rRlIK8+9PJTnrbAzqDiKTjV5jvYZ96mT+34p9iGSSA3ke/WtcWhklqbQ9q0MHSNrF4RPEGOlWsFafQ2D5WbdhO50EVZZFAjU9X6drlhq+jenLCzXj/mQRH3r/KvVxbilMEuhFH2V45PVOJbB7Sn9MlAk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=hgX4JlqB; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=wv3RvtjK; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="hgX4JlqB"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="wv3RvtjK" 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 42PLG1Sk002291 for <linux-xfs@vger.kernel.org>; Mon, 25 Mar 2024 22:08:26 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-11-20; bh=WDZUJ9QHMLstBHKV4NMappBPTbxlKjXH4yEpwFRacWg=; b=hgX4JlqBaYI9K6AmTMOvBDTHMJLgFj5f9JWrrzx7Jc+yPRuivlrctlnc+p+zEnK9vpr2 QjwS7H+2JXfgJC+PYV0ATz3DnXjxtC1b4jU9KdUdjaBWDNKgyil3+XyRsWYclRSIlMfo oNuByU39DhXeQ6ZOzt8hvmhQ706lNOlRMYtwi77LLNCP8h64kpdwPu1jxrTWz1sO42So 2O89e2xC0YVstEaWi/WeqdPdeGEprXWK4RWvBtI9/EyVCDVL8oDGbO46xSxy15Ax5y7k dVh2kdyixLMosDnIVZ4xuMw+h9o8NsCuz+Ea4dfM25pJ7xhQwJmNhQqYxy73Bhnu9hUl bQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3x1np2btj3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for <linux-xfs@vger.kernel.org>; Mon, 25 Mar 2024 22:08:26 +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 42PKPhAL015960 for <linux-xfs@vger.kernel.org>; Mon, 25 Mar 2024 22:08:25 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3x1nh64raq-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for <linux-xfs@vger.kernel.org>; Mon, 25 Mar 2024 22:08:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VV2tYB/nq901W+h5bccCooFaX2olWCDnpcvaLgI2bSvVepx6jTVaMlqPbMo+3M8X23f+ahdRaIoBv4rm8xKZq4nSKlR6fs1P4GZoJzbfIfimF6cfsTbxOgvyePU5XrYklCig4f0Yi+7NHXsLM7eS/ntHnsNDf+tHRfbBW7yegoaZ+dRQbf7WIWcJmTqhduXmxDEKsd0QD024bCB2om8XM6mhqvLBSdTm1XtM/biAlnFvNG4WVMSS6oHDAiBiC86jRsynxDLvxgRoHaUDVlYbbwm3ka+MhEyldYdsLBQFTeag4L20xoPhOVKHqItjn5vJMwCpsCOMsxhVC/o0SAIefw== 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=WDZUJ9QHMLstBHKV4NMappBPTbxlKjXH4yEpwFRacWg=; b=n7KJEpIovV6wmTfyVBrdmEvVuPEUahIPrmuhu7WRxM2mTl6r2+Kuex3vbagpQBWYdLKMydl/9CrB1R1MJGn0zZzr25Q8yGPrbhIW9tPgfZO2fYj5XSKjmJYpi+pCcLO18eZQTODdJOvnmIX3Kuj+OdvSR+yApTZREcI/l7ZZnVqLR+eyR8cuWfnHjrBxy3t2t+gZOn2oEi1Df9xBrQyODrOdeyjsjlN26NKUESZOeb4TGrAY8ug/atJKfgTK5o3XoZJR6tw3AuGSWRi+v7WunpawtmR0Lsfna1dyEv9RVtiO42G907Tf3+IwkFQ2oCBj5xCfKd/LLkO+5E8L7Y3B0w== 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=WDZUJ9QHMLstBHKV4NMappBPTbxlKjXH4yEpwFRacWg=; b=wv3RvtjKCEcAMPmO8laaowhQiQb4rvTLAvc58I0+VlucjAt1b3IfyUkuMjekgzamnk3t2k85liEd8KF5A43pCLVbHnBI2tyfA2IXeGDVuoDvdFrQnGrW4dDMjG75bkrYiJAocib/koSKKxzM4adYJrhAzu9f1FKB00nGyGw4hd4= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by DS7PR10MB5005.namprd10.prod.outlook.com (2603:10b6:5:3ac::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Mon, 25 Mar 2024 22:08:15 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::404e:f2ff:fe2c:bd7a]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::404e:f2ff:fe2c:bd7a%4]) with mapi id 15.20.7409.031; Mon, 25 Mar 2024 22:08:15 +0000 From: Catherine Hoang <catherine.hoang@oracle.com> To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE 22/24] xfs: update dir3 leaf block metadata after swap Date: Mon, 25 Mar 2024 15:07:22 -0700 Message-Id: <20240325220724.42216-23-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240325220724.42216-1-catherine.hoang@oracle.com> References: <20240325220724.42216-1-catherine.hoang@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR03CA0018.namprd03.prod.outlook.com (2603:10b6:a02:a8::31) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: <linux-xfs.vger.kernel.org> List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org> MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|DS7PR10MB5005:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LWWLH51CaslmMn8PVe5/tuEN927xh78KO5Cl2DQLeinVKpVHWxgUVnwq0NqMbCjb61wECiZqDB3u9RvDt8KvDR0fcixfcvxtD4uKBhgENeugbBpQw2FEB11j8EPUItkKCQLzlp1TM0D59bpERT9Is2npjJntmhK8/oz/HAD6alEshVMY4NymquYuWeoAKfHf06yVnyw6yc9SkJoa4GfXpesWYqKY5M0ajV3jCd+klBh7sUgHGOtg5Zs0HKLbMdavSum2G/Sc0MwPG/bgxkJmGf2bQfKeYHp2MhPHx/Af9T+zj2xcGkO62D/edyTvTD4vBYU2Q8a/xVpylI9yGFTuSpx4DK+IOmub2jBIFCNbc+/8fQ5vexnZPNrfoajydmHj8c0QKASLOUeR+ZphsYIlr7BYgrIUXIzfbJuziMrKdQuZ9PHup6dHeJTMZjKZEJu2WSMK6d1rtvrYQN7INz/RHbTkNbF0QWXQs7Yu1s0rdeBr158W5E3AyogPHPG1OwcKmKl6k51tVndpvX/EnrudRoY9J1+UqjBTNdO3uLiYr4xjSKUtQva4kDHA1R3v50j1DXBflPtzKCns8wRR6pmOZbeIPfOw4mh2EtvkeYdpREnKVZDr5WLoyc6VLNUX/P90RtTN+D8dEfwCxzzUwlQTX11pLg5sp+3ExGsFlsvukmY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(1800799015)(366007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1+WVM0mQkszpjsRp++O6S26+mZ3QF1cedWudVvcE+CtEgipXNbIhRx6K9iiqy/9IsHS6gEvuYI+fiewy91ZCPeltSlEdut2e2icj+uNydxeJJz/qYs3V6blgP5Ew0v8MlTSDSuVcCqneH0lUZTOI1Zh0OGOu6b1D+9Ltuo7GnREqAFqzssZ6reELT46+uh/QDWKPtAUEm44ocknLF96wuvU8Hxp3TrrZSyWNC0K3z6CBUHfe+AOZNCLy8SEhgs/pVWAvBzf+ZokFqZpPI4psOZ0OQJpGDL7gfcuZ2r8vJniD6AA6EqJT9801UEHGdkPEEna2VWWcwcH/QgCBYHH5tEiyPf1LlRrPSdE58+PSAarcXMuPc6RvJCtsdSjdP7j6Atnc2WZ4+CgqNSY89ugarSPnL00uI5Ba98q4EOJbdiKMGRFfWXJUa17XvABXdMhpdQpp7iMLZDMCtG7SzBdCs7b0CWklyb/UP4nweX6ATK5Qok0fcayLViqSg6KDxIKhCqp2g5eeaCLlImyvJ6B3VQFNp79qgYVh7n+w6B/6S9+CqdP+J60E4e+8KcPF5PevDg+MGQ9Hxbi6f8kXVMmgbWW8tqc52HFG/14LXMM4NNs+oMD0ra23YNgaS9cZheGRuN5BMR2V0TnvJUMPVx49b7nYHTf0IhPeFnSNWD9+5Ow7VSTYXW3MOegUJk1KG7Pc7S5x6qhMy4KfqFM61TJs6n1kvg/Z+NHUam6tJN8YZ7wDsSrGspIFL+rxG/9lTTjhZF4dj7cDTEG4zUrILg5UuPGy094UUy+5iae6GZ+OYOgS22NJ/AKDMzxngK13+ijU84Ah+e1K/mBWvJPX+T8Cah0YNqxwdYNdLz2hGvZju2Dk1mrLAZPUC7j8SpBy1Fj7WhoBoJ30wy7g7ZbvVmj2G6IxRKnjjBNVV7rHZGo7Szhv+PZUgQU1O2UbdOyXhd6H2QSDoF8PjGAi52/don3tnJ7dhYKDXPY0+VaJ/Nu0Jr4F+wOVf+V6lju+fBrZWjxhm6b/oWfee5IQmN0tBgV2XHwjifGtCucmHQahzIWnqYPV7M+2cYbQPLrWY1NXXqeQw+tLMLYL3FIAyayDjLK8kE3uc4AGQgmXNSiV/egmpg8nmbyjfEhg8mb7d+o539ywOOSlS9ffDd2XsKEKOjyoMleLKALlr8jZXqCHox2NSbd0q8X22L4xJujo2Ds+sPvDSaGZUzxM54XUxEbdXQHWCBysngpf8FCzn160CtNKeREFbuvhkXAGjy3+RQg1XISRvvR9oJRj2WRnj8LRyQT49aLmLTneChQ71w2TfenTaQMyMrX1RLm0NLJ2Zwcg5Vs2LKVFqvNMUVs4uHpLfvkdxBjabCj1ENirnmiNOmGYFRct/zijLWiDkmxlp6y/zniqkhjcj2mF/Uw05zWS2yNQoXtxd6pAgmKBGYalztmWRW0z838CKTN7zeAUAzy1LrF2ojGUW9AJ5zDCOKbx4YEEX3/Ki4QsmDKBhTfDrj8SVYaCMvKLuotxxI/tGHeVv0q1uNyOwQv+qplMRo6yBBX9eaPszo1mksZ+gZCeTZCV5NAzg8N/8vSZ48O3/hUSrzymkJBceZxGRJkklfVucM25yf8hnDqE0/V04N/z0AY7gcmgwpSj0gkt36xZeElhN1wOaL2bBFLV5XXGqSPN0QZ82g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1PkWf+rm248BwmrqwBZA2REhVoFqJt9rj+Kqx4u5r9osEiAKMcBpDKrzspSgMsiFj/K55ImqqgiJ30ECKZs1OBnywHFtis4aziZUj6+cJsPlMnaJdPxwYr2c53Y42HgNeKs21CiNURjn31nZ/jt5NFGxlgPkINzeQlxUZL5bFO6s3NWsIsHD8V48VyVuPQzM8UiPpMbSMALjLEENdMndZE7qvagaY2EEkzMyrKmxBumrLp8uDCAdgBiV94m+npUdp0Uh10A+3KzJeTN3uiOoxJx3yAf/8KkjVSUbew1YD6j8AedHr/Yb5QfhfXkMrzmmdQRvXj6izYc53SwTxVvDG2+KRvVQs+2EuWNQM1DS4ILWISgqh2xZT2SkWNV4ifiTYUFXzzm678Lupd5cOpGdct2Isjz5BtqVv79d3Uypyd70rs9hF2HxmWjD4HMineu0R6jqGlDwJrI1YOKE5R4IkcQKbJ1yKRMMuxPVMwZqcxZxN6AXMXPSeZA5+DVoxMyJTcYX45o9/1djfj+9vL+SNj7+vd/A8t9VvrK3OHIk+dZFcnZhuDyTJnuiRBnXIDiq8wXtZHdhJX5C4CQMaXM/1kkyq0WAXQmZ9RGrVA10LKY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0c7472b-b040-4269-bd6d-08dc4d1811f5 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2024 22:08:15.6833 (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: pkU40wD4qz/g28RKjOnK5Sw3jdHLNcMDksGALRtMHUvD3GWjsR7ZyvIaOA3ih9r4W6rpNYSWuw/iC759O4k9yb1Y0KoLhFZ4zCZjWBaqR2w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5005 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-25_22,2024-03-21_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 phishscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403210000 definitions=main-2403250138 X-Proofpoint-GUID: 3DXcYVlOMtF6dVn1BVmew2sVUJkioBy- X-Proofpoint-ORIG-GUID: 3DXcYVlOMtF6dVn1BVmew2sVUJkioBy- |
Series |
xfs backports for 6.6.y (from 6.8)
|
expand
|
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index e576560b46e9..282c7cf032f4 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2316,10 +2316,17 @@ xfs_da3_swap_lastblock( return error; /* * Copy the last block into the dead buffer and log it. + * On CRC-enabled file systems, also update the stamped in blkno. */ memcpy(dead_buf->b_addr, last_buf->b_addr, args->geo->blksize); + if (xfs_has_crc(mp)) { + struct xfs_da3_blkinfo *da3 = dead_buf->b_addr; + + da3->blkno = cpu_to_be64(xfs_buf_daddr(dead_buf)); + } xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); dead_info = dead_buf->b_addr; + /* * Get values from the moved block. */