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 1068F405C31 for ; Sat, 16 May 2026 19:09:20 +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=1778958561; cv=none; b=V6fcrRmGBrF00x0BdBwwz3A+lTunrrCZ1wvpTDZPfmtVj58CGnJKLYvdNhD8+WA6TmHO6imLuv3e/YxlJtZLpQ0un6JNWg5CXMtg8RFgnwOJQn4tayraw3GZRoJbdPud3Y5dEqbTxHNvsrVHOyhlQ7EjKI+Q9bZ93cKJw4eAu5k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778958561; c=relaxed/simple; bh=FH/KORPj1srGtx2xVCHqe7VEqiQgEtQVwyr1tatchwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yo9c0p5k/T4vMxUH4WKsaND2vmYynn0Aavq7nPcdDYXws/KA2fFDPsQcW7m8h6y/rjvieVuUy5UXpIMvWcg6+pt568HUHKgktxvCxae9vYO/KCiKzgYqw+sT4NzlNnkkk8ydGDE/vnVUswYLcElDXaZgVCDeRb/KCvRssTMWBdg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e7Hq05HQ; 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="e7Hq05HQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9D3CC19425; Sat, 16 May 2026 19:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778958560; bh=FH/KORPj1srGtx2xVCHqe7VEqiQgEtQVwyr1tatchwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e7Hq05HQQgYQuQWShPmU/HrhpjdPpMTbV2qSQTabTCT4SKbQuhi+3Uv/k8mngAwEx vbb4Mef0HbytF8S9c7m7wElfC1OxptzKZ6lBpVtErWvrZfohVQdwWU7UpBNplIgv1J ZnGf5UAiPFmJAzzyFFtUlUdS8OnS+lRwN97laV0RYTRr6hMC7bF/mj/SkAJ2k7sjXa 2AsE8mkalJXf0sjQ1xIFnfS35UvP+wXI2m3a1TKp9wibArxQjzCsm4mGW6ow1UtEZ7 v/SbiWnIw92MoLnfNw6IkJFkmq9pQlBhgRomri12yNZqI0kFZP8ktcharqy1PDPpMF xLSONSU9Tfgbw== From: Sasha Levin To: stable@vger.kernel.org Cc: Filipe Manana , Johannes Thumshirn , Qu Wenruo , David Sterba , Sasha Levin Subject: [PATCH 6.12.y 1/3] btrfs: use inode already stored in local variable at btrfs_rmdir() Date: Sat, 16 May 2026 15:09:16 -0400 Message-ID: <20260516190918.4017278-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051231-sandworm-portable-73a6@gregkh> References: <2026051231-sandworm-portable-73a6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Filipe Manana [ Upstream commit 9f82a4ed34d870b5719f9b95f7da4f74d3325a6f ] There's no need to call d_inode(dentry) when calling btrfs_unlink_inode() since we have already stored that in a local inode variable. So just use the local variable to make the code less verbose. Reviewed-by: Johannes Thumshirn Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Stable-dep-of: 999757231c49 ("btrfs: fix missing last_unlink_trans update when removing a directory") Signed-off-by: Sasha Levin --- fs/btrfs/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 28024c827b756..981526b7ad684 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4801,8 +4801,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) goto out; /* now the directory is empty */ - ret = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)), - &fname.disk_name); + ret = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(inode), &fname.disk_name); if (!ret) btrfs_i_size_write(BTRFS_I(inode), 0); out: -- 2.53.0