Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 15900283FC4; Thu, 17 Sep 2026 17:40:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789666853; cv=none; b=Og0nvZQkKtMPE0ClqcYp7nmBO+q2EBZTfEO27tU5ez9EN9YDI8BMDs2hN9+XMp5NoSEIP6fwSJ9Jlg1Z1iSPdKX2sXPByf2SfZFp95ERtpnEiKtSEyMpPdlsRa/dj567ui2hvRoUvQau5HQgkTgswoI6Bq/CJu1c7wJYA3/Zt1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789666853; c=relaxed/simple; bh=5nSy0OXW/I7r9dmZV6i4UHeZZSlCQ+5eXVEJr0NxlwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RvLM8EjByfjuZNOzpx2yIYZ+5XRwB+QvIo36+ZXoM2QkIzXhvNPSHQkgdfONECkL5gLSkIpw+TFTShfzjUE1wo1Q7daXklAb30hgkhhg0gY0G6VbdjDojtUTJdQpg3onSbzdv/MYi05TdiFci+LkByHEA2tOSUgD82oZvDYc0bk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WyN8kw1L; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WyN8kw1L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57F061F000FF; Thu, 17 Sep 2026 17:40:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789666851; bh=/aEV4reGs2xD3WymPJQPkzn88jyXuI9HTQwlGfrKt0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WyN8kw1Lnfan27OFm1hPyquW//jtPNe5hWCrGkWxhoY3QdfDo0PTFtcZGMAG2tIxi B5NPSPjHGY/ptMhEseoTOE/vuPm0Xqk2GcNDFBZPwL8QWvf4hZnsVjU82dxymtdh3A /8OHvVv6wAspnWOXdnFReo6t0EwppCBtQKPlwpHk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Darrick J. Wong" , Carlos Maiolino , Christoph Hellwig , Carlos Maiolino Subject: [PATCH 6.18 1108/1250] xfs: fix replaying dirent removals into the temporary directory Date: Thu, 17 Sep 2026 16:15:03 +0100 Message-ID: <20260917151622.224796353@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Darrick J. Wong commit e854f9a28b1fa08dfa5bf18ee4184fae90106180 upstream. xrep_dir_replay_removename is the function that replays a directory entry removal from sc->ip into the temporary directory so that when we swap the contents of sc->tempip and sc->ip, the directory is correct. LOLLM noticed that we were passing the wrong inode pointer into xrep_dir_init_args. It doesn't make sense to set rd->args.dp to rd->args.dp so let's fix this. Cc: stable@vger.kernel.org # v6.10 Fixes: 8559b21a64d983 ("xfs: implement live updates for directory repairs") Signed-off-by: Darrick J. Wong Assisted-by: LOLLM # finding obvious bugs Reviewed-by: Carlos Maiolino Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino Signed-off-by: Greg Kroah-Hartman --- fs/xfs/scrub/dir_repair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/xfs/scrub/dir_repair.c +++ b/fs/xfs/scrub/dir_repair.c @@ -721,7 +721,7 @@ xrep_dir_replay_removename( const struct xfs_name *name, xfs_extlen_t total) { - struct xfs_inode *dp = rd->args.dp; + struct xfs_inode *dp = rd->sc->tempip; ASSERT(S_ISDIR(VFS_I(dp)->i_mode));