From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2BF213FB057; Mon, 2 Mar 2026 14:03:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460188; cv=none; b=r02z2Qem1NLCzvEg7T251IB7+3aLsxuQydM8qr2ZjQDBy91L6VVkZrIWr5b71DkCISNBycE0yqhB43IbftjOfZCS7PLKLN7G2t4FYyUfXQl3vp0INu+qCMN0wvgYzn7wTHDdajacQbqkZw3+GZcHYEjhmC6trnaLtASOS1gEWvo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772460188; c=relaxed/simple; bh=uS+jEDkHQBDcJ1fEw4c3e2YaXyaB/oeV4gKk2RwKeRs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=D263go3uJJ5he6D/RgZ9sD1Z+ETAKo4Y8cmqrNG1cM5lx3JU23/ihHJ7RbsqC8sRnrY8yTGzj6tKX+LogD5ReS9G9XR0DB/DEU0liEF/++EwqmoFCqVul8+9yoW05E4TIeuSG0TtEpS7yBMhf7r5MowIHAKvXyJUq1XxB3iUi0g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a2xj67eF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a2xj67eF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4B09C19423; Mon, 2 Mar 2026 14:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772460187; bh=uS+jEDkHQBDcJ1fEw4c3e2YaXyaB/oeV4gKk2RwKeRs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=a2xj67eFK9JHGvAYXEwBCssHFpgaV6iLmtGA066xshF7A6OYPOFrmeIRy8YkWSV0d NtmE6zLvkLjpe1n6pUTyxyZP51VH6yUeyYubxwYt8Opck5iMw7CQlxRZWLoVuPHwyR 62aDZfnyad997BxQjSDEEQNrXkCCSOznKNVyuk0v6ECT4NUh0ogGUUKzzTzKkACnLc DWKNwoxTU9PAG8p6opCXAkL4+MDDT1OPWTtL9zwf427gCexX0EYDjCqY7Z/9kzMITR 5PpeJmVLIvKZqig4iIYkv1wXh8kHQ8lZjBhq5BF8X1sPqL/RKSh2i90De9zxDYTpWV 8zgbqhyBzNFNA== Date: Mon, 2 Mar 2026 09:03:06 -0500 From: Sasha Levin To: Jiri Slaby Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, "Darrick J. Wong" , r772577952@gmail.com, Christoph Hellwig Subject: Re: [PATCH 6.19 689/844] xfs: only call xf{array,blob}_destroy if we have a valid pointer Message-ID: References: <20260228173244.1509663-1-sashal@kernel.org> <20260228173244.1509663-690-sashal@kernel.org> <91b4797a-77a3-4955-86d4-06ac4def8704@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <91b4797a-77a3-4955-86d4-06ac4def8704@kernel.org> On Mon, Mar 02, 2026 at 08:06:04AM +0100, Jiri Slaby wrote: >On 28. 02. 26, 18:30, Sasha Levin wrote: >>From: "Darrick J. Wong" >> >>[ Upstream commit ba408d299a3bb3c5309f40c5326e4fb83ead4247 ] >... >>--- a/fs/xfs/scrub/dir_repair.c >>+++ b/fs/xfs/scrub/dir_repair.c >>@@ -172,8 +172,12 @@ xrep_dir_teardown( >> struct xrep_dir *rd = sc->buf; >> xrep_findparent_scan_teardown(&rd->pscan); >>- xfblob_destroy(rd->dir_names); >>- xfarray_destroy(rd->dir_entries); >>+ if (rd->dir_names) >>+ xfblob_destroy(rd->dir_names); >>+ rd->dir_names = NULL; >>+ if (rd->dir_entries) >>+ xfarray_destroy(rd->dir_entries); >>+ rd->dir_names = NULL; > >This cut&paste error is fixed by: >e764dd439d68 xfs: fix copy-paste error in previous fix Queued up, thanks! -- Thanks, Sasha