From patchwork Tue Nov 28 05:32:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiachen Zhang X-Patchwork-Id: 170534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3698370vqx; Mon, 27 Nov 2023 21:35:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1DcJRZigceY3bIhNYLi+vjeM53gMS2B2RSgrYJlhZxZK3pPrX9ym+B64UUc2L52uYLiqJ X-Received: by 2002:a05:6a20:bca7:b0:18a:d4c3:1350 with SMTP id fx39-20020a056a20bca700b0018ad4c31350mr11873131pzb.44.1701149705863; Mon, 27 Nov 2023 21:35:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701149705; cv=none; d=google.com; s=arc-20160816; b=OFvK3LeN9rvZHgBYlHg6fe8qKwyQw1TH3olVx9H4XLU8OsXIvvDJMUZyXlQZB44h8K GXZF9g6oygvHrbwVc3ueifhFQQeEOW+chkG9KUPrg/OjM8kxPad6Q6VrE5Ny3bTo64/9 B2g4Y3LE3dJSUcrGUWLmUcv4i7Zi6Liy2jayDOugvae20gy7/iT90Vk8dzvE/5eQGPYQ tdwGHvLhzO1cCnNv+yeDrIKHfgNczrzTVnnw5YeHULWH1btnIKmFT1q1N204yUKvhHqP JsZUaAHSGKT+z63t8DvRgVnC9AoSxV9x2FXXqBn22dE1/dFcV7EbHwaCR7lWD8R9ie88 b+5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fxO33hgX7qudIID8yDsz8ucZ3gJV05i7WjPRt4ATm1c=; fh=af6/g7Mw4PWw8c1/IQL1lMUyTpO0lxbaYh3SFBWn9U8=; b=njJwgF26ccGOjDlWlIokDXWLTx9h5KBruVNxKxtoyTx6YHACbgBaMgCKUVepPIG6xK /e7+ZjRvaIok5v2OjRGZcdqnWmscWHUO6gnH3Kw7dkpz3lmFqygxQ6m4lBaavGZnetUL X9jSWVINQzVbILfim88r4l/clipYkoQye+jsdrsodC5IVob0G5NEIqhEP8LS1DEFjmcz cBGOnS+RQM9xWPAdMOOKxJiqxbGkAxz1PU4NiRfzjlLu9Y2eUs+p0ZkEPfNZUbhG3KnW PVfHo/lLbrDKs4CfxT/RQMqmtOlKl9ZipKmTDlNQ7FtkUJtL9D16mLvckXLB3Y8/w8Xv IWzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=bhZA9CJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i7-20020a170902c94700b001cfd295e132si3556498pla.441.2023.11.27.21.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 21:35:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=bhZA9CJc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 09CDA805FD64; Mon, 27 Nov 2023 21:35:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343574AbjK1Few (ORCPT + 99 others); Tue, 28 Nov 2023 00:34:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343552AbjK1Feq (ORCPT ); Tue, 28 Nov 2023 00:34:46 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21731E6 for ; Mon, 27 Nov 2023 21:34:29 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1ce28faa92dso38862925ad.2 for ; Mon, 27 Nov 2023 21:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701149668; x=1701754468; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fxO33hgX7qudIID8yDsz8ucZ3gJV05i7WjPRt4ATm1c=; b=bhZA9CJchPrKFiQfbQF+NRJRfXVXkcAFEkGxZ7UABAQ1cfDqDCZbSPOzurpSk+scPc hQUC17nOc6sFrkYIFnANlXLljAnqoMLyZ8IsuHhUjz8zPTQaHuKgL6TfsGa948nxoA/s IWgg84LIqYD3zvi9L+9R5nogMayy0c1PwNm2Sbqv1gUDpYi56dUnzwXklqp6iws57fxa pmaFrp/fyFhjuKW5nt1F+GGhGqFA6rAx4hnIcczt1/k9XmUmHlJ3OAFTeQ09QlVailTJ Gp3nZo7d9vmhhUOMLTPHlXkBzagXVGTmutvEPFDycrfxhdBZY2LFOwVklLP0LFDDrY3m pelg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701149668; x=1701754468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fxO33hgX7qudIID8yDsz8ucZ3gJV05i7WjPRt4ATm1c=; b=UwiULU3yeYzIezEvFVdoAavjK6hBqR7OlJp13jZuNCYYsiafXA0jC6yEvw/vOkvm+b hy4PLxNkJPLL/kAYdFGmXgmmmAEj0or9ddYjLJdCPQ3cJK75FHn1vxRlABOjS9kr2oIE Wb5IrCay2PpbzAxFrBDxg31K65+7aQV/UTDONaJUHftLPiUISbGw3uHtCr9w843qsVd2 MDhh1+1nbDKsQkn7mKOuCc0gPFiO8FrPYdDoTzluzkeLPFM/Uk9TOQQDWNUFpYtwOnFT udroEdlvJE/hz4yJq7m1+gTLqvpzm7ZfJWwUg162kwDawNrM+daBG3K4+UMseXruci86 xIzg== X-Gm-Message-State: AOJu0YyN/eiSBvm+NiQvFAU67Ujiv9yO0JnbitQI8lIfzVmZtMlZ6cll Vvpoyn/ALieCfwq5YyIPkAD7Xw== X-Received: by 2002:a17:902:b401:b0:1cf:9790:f243 with SMTP id x1-20020a170902b40100b001cf9790f243mr12596195plr.61.1701149668646; Mon, 27 Nov 2023 21:34:28 -0800 (PST) Received: from localhost.localdomain ([61.213.176.14]) by smtp.gmail.com with ESMTPSA id u12-20020a17090341cc00b001cfb6bef8fesm5372899ple.186.2023.11.27.21.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 21:34:28 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , Ben Myers , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top, Jiachen Zhang Subject: [PATCH 1/2] xfs: ensure tmp_logflags is initialized in xfs_bmap_del_extent_real Date: Tue, 28 Nov 2023 13:32:01 +0800 Message-Id: <20231128053202.29007-2-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231128053202.29007-1-zhangjiachen.jaycee@bytedance.com> References: <20231128053202.29007-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 21:35:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783784753843633804 X-GMAIL-MSGID: 1783784753843633804 In the case of returning -ENOSPC, ensure tmp_logflags is initialized by 0. Otherwise the caller __xfs_bunmapi will set uninitialized illegal tmp_logflags value into xfs log, which might cause unpredictable error in the log recovery procedure. Fixes: 1b24b633aafe ("xfs: move some more code into xfs_bmap_del_extent_real") Signed-off-by: Jiachen Zhang Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index be62acffad6c..7cb395a38507 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5048,8 +5048,10 @@ xfs_bmap_del_extent_real( if (tp->t_blk_res == 0 && ifp->if_format == XFS_DINODE_FMT_EXTENTS && ifp->if_nextents >= XFS_IFORK_MAXEXT(ip, whichfork) && - del->br_startoff > got.br_startoff && del_endoff < got_endoff) - return -ENOSPC; + del->br_startoff > got.br_startoff && del_endoff < got_endoff) { + error = -ENOSPC; + goto done; + } flags = XFS_ILOG_CORE; if (whichfork == XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) { From patchwork Tue Nov 28 05:32:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiachen Zhang X-Patchwork-Id: 170535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3698461vqx; Mon, 27 Nov 2023 21:35:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGItASGC+5wE59ugbJkf6GZ2WiV9FexM2E+VyIwAwK13196kGbH18+NOY8PyVmDBk4gfcMF X-Received: by 2002:a17:90a:190e:b0:285:8cb1:7f53 with SMTP id 14-20020a17090a190e00b002858cb17f53mr13082422pjg.31.1701149722460; Mon, 27 Nov 2023 21:35:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701149722; cv=none; d=google.com; s=arc-20160816; b=XASub3caZTeju86/hO4AJzqGZ8ufDrw0h5w9quqTjn6FakulKc3oVwoiMDxHz+1Ya+ q9gyGBKoc+s34PmG16IbJwUHLD4xP3FA53Ww0SgD5Ko6Uw0sptswdd0et5sI5X0GlTun Shof2Zf+BSJwRy9zTijABWAXiLklFgux3FC1Wp/J57diNZjZY+QhiXrPFa/RPuHnIvH+ bnkuufmreT5RBDqqmSyTPm0twzifd/MX3TW3+YhOfz+g0jiqY8iPDsmDUezBoG5fnhc5 r8RGDNrHlLCN8250ASZqtQWVLvp4Ojbo3M7asmrIorxeeEDaBQ1r28aMswnGLyiQbLtB /i7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PRqsnYQ6nV0dzX6Vx06lKgWxOV6XUUCzggjpXFerXKM=; fh=/A4uQK4zZ4z4hFyiYOoCGRCW2xUQ8LWPawF3BhAqto0=; b=v898r4Jmk73Uea+Vv0CfmgwoA8NQ6KmfWfV6gWIPTAXGumj4wNc8HxBGlaE4viAuTX sCd/r8poSuYHx5ZjlEUb4/3BUZVYiqcrPJhAvwYdlQzg5HF86S5h+eZJG2/MKHt2+JwA 5lJThEClqSDScvZwa5xi1Torf4dfzNbPJOlm+4dzxOFC3jMx/f8gL0mCK50x0gMpNE3K G9ez2ULL6wAQwHCT0+QROMji2uM9f6a1zpptSCWLi8wbb9tOOojWKPZUPiXx+CzQvMxi rb16KD7ebAVHqk4pt9dZvyQoPNkjfgI07oPXf9yd4UtR/llZMC524T9rsHeTXDfPB/Uu VUHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=MFB9k4mW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id ha21-20020a17090af3d500b0028595b2d53bsi8247887pjb.90.2023.11.27.21.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 21:35:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=MFB9k4mW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D815A8078601; Mon, 27 Nov 2023 21:35:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234627AbjK1Fe6 (ORCPT + 99 others); Tue, 28 Nov 2023 00:34:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343552AbjK1Fex (ORCPT ); Tue, 28 Nov 2023 00:34:53 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C293DE for ; Mon, 27 Nov 2023 21:34:38 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1cf7a8ab047so38875575ad.1 for ; Mon, 27 Nov 2023 21:34:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701149678; x=1701754478; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PRqsnYQ6nV0dzX6Vx06lKgWxOV6XUUCzggjpXFerXKM=; b=MFB9k4mWSQv3i3ltZ0GgzWfKQZHjbG9ZrBpeRijLSZKtffqDCMVd6PdK7C+H1xnYy+ mnYSd+ZaOyp6QARthaZGS0BkKDx3o7r6Tfbeimc2eFcwfZuPHI6d0GrY+diF9bNpbpMU 2/pGMPwuo939+BVPZmXf/hs9BjQTTxIPrdz+nQYcaahJNps7l2ZyjW3utV063M70zPlG J/1s5dUkecy9SzsvacUlkrHghiH+Mk7gO5NEqSISQYl5czkOfdtuHs3ln1n3GTm83ZlH QljufujAVvTWjlgoIa1njlTrdgi9XVT3Y65bvOqHKMWkXznfk452ZVzRozr3AOeBJR49 MqAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701149678; x=1701754478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PRqsnYQ6nV0dzX6Vx06lKgWxOV6XUUCzggjpXFerXKM=; b=NM8EQFNMao2frWPa5sxF0cKGEXjdTYoqYVkSaVqUeW9AnyRjneR+XKc0I26SEBCEk2 pbSgiBB9R/5O/RFND5IWbAE0a4eKTHLFl7VhPmDlMgg85+l/Q5ELVcYDZLXw/Z6jH5x1 aLXBu/jv7mbDC4vnmN6in5scpcb8Pv36fIKEwZtON/s+b7FjTTkvRNiJ61+p2aBczyYj QQr6Owjn9ZoYOGoFNRxwjOYWjjUdAxs5rgPAfY0RIjJ+I4ffQVLM49zmICHSBomrncbT UjMqpfd+/5DnWThKleS64jtahIH4GZoL0whh5D8KoKRDnBoMcDZLPucdjT40wa1szWY1 FxVg== X-Gm-Message-State: AOJu0Yy9dQnoNgqtvuVk8VAcS43aWIoY9xBlvSrgPhq0CnJJUTn9ffe1 sEV29PYNKYRA2IWzC1efWz7JMg== X-Received: by 2002:a17:903:183:b0:1ca:a290:4c0c with SMTP id z3-20020a170903018300b001caa2904c0cmr16142204plg.16.1701149678085; Mon, 27 Nov 2023 21:34:38 -0800 (PST) Received: from localhost.localdomain ([61.213.176.14]) by smtp.gmail.com with ESMTPSA id u12-20020a17090341cc00b001cfb6bef8fesm5372899ple.186.2023.11.27.21.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 21:34:37 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , Ben Myers , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top Subject: [PATCH 2/2] xfs: update dir3 leaf block metadata after swap Date: Tue, 28 Nov 2023 13:32:02 +0800 Message-Id: <20231128053202.29007-3-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231128053202.29007-1-zhangjiachen.jaycee@bytedance.com> References: <20231128053202.29007-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 21:35:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783784771439935093 X-GMAIL-MSGID: 1783784771439935093 From: Zhang Tianci xfs_da3_swap_lastblock() copy the last block content to the dead block, but do not update the metadata in it. We need update some metadata for some kinds of type block, such as dir3 leafn block records its blkno, we shall update it to the dead block blkno. Otherwise, before write the xfs_buf to disk, the verify_write() will fail in blk_hdr->blkno != xfs_buf->b_bn, then xfs will be shutdown. We will get this warning: XFS (dm-0): Metadata corruption detected at xfs_dir3_leaf_verify+0xa8/0xe0 [xfs], xfs_dir3_leafn block 0x178 XFS (dm-0): Unmount and run xfs_repair XFS (dm-0): First 128 bytes of corrupted metadata buffer: 00000000e80f1917: 00 80 00 0b 00 80 00 07 3d ff 00 00 00 00 00 00 ........=....... 000000009604c005: 00 00 00 00 00 00 01 a0 00 00 00 00 00 00 00 00 ................ 000000006b6fb2bf: e4 44 e3 97 b5 64 44 41 8b 84 60 0e 50 43 d9 bf .D...dDA..`.PC.. 00000000678978a2: 00 00 00 00 00 00 00 83 01 73 00 93 00 00 00 00 .........s...... 00000000b28b247c: 99 29 1d 38 00 00 00 00 99 29 1d 40 00 00 00 00 .).8.....).@.... 000000002b2a662c: 99 29 1d 48 00 00 00 00 99 49 11 00 00 00 00 00 .).H.....I...... 00000000ea2ffbb8: 99 49 11 08 00 00 45 25 99 49 11 10 00 00 48 fe .I....E%.I....H. 0000000069e86440: 99 49 11 18 00 00 4c 6b 99 49 11 20 00 00 4d 97 .I....Lk.I. ..M. XFS (dm-0): xfs_do_force_shutdown(0x8) called from line 1423 of file fs/xfs/xfs_buf.c. Return address = 00000000c0ff63c1 XFS (dm-0): Corruption of in-memory data detected. Shutting down filesystem XFS (dm-0): Please umount the filesystem and rectify the problem(s) From the log above, we know xfs_buf->b_no is 0x178, but the block's hdr record its blkno is 0x1a0. Fixes: 24df33b45ecf ("xfs: add CRC checking to dir2 leaf blocks") Signed-off-by: Zhang Tianci --- fs/xfs/libxfs/xfs_da_btree.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index e576560b46e9..35f70e4c6447 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2318,8 +2318,18 @@ xfs_da3_swap_lastblock( * Copy the last block into the dead buffer and log it. */ memcpy(dead_buf->b_addr, last_buf->b_addr, args->geo->blksize); - xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); dead_info = dead_buf->b_addr; + /* + * Update the moved block's blkno if it's a dir3 leaf block + */ + if (dead_info->magic == cpu_to_be16(XFS_DIR3_LEAF1_MAGIC) || + dead_info->magic == cpu_to_be16(XFS_DIR3_LEAFN_MAGIC) || + dead_info->magic == cpu_to_be16(XFS_ATTR3_LEAF_MAGIC)) { + struct xfs_da3_blkinfo *dap = (struct xfs_da3_blkinfo *)dead_info; + + dap->blkno = cpu_to_be64(dead_buf->b_bn); + } + xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); /* * Get values from the moved block. */