From: Mateusz Guzik <mjguzik@gmail.com>
Date: Wed, 29 Oct 2025 13:49:52 +0000 (+0100)
Subject: fs: touch up predicts in putname()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20052f2ef08a74e09a655e70e41abe648b63a9e1;p=thirdparty%2Flinux.git

fs: touch up predicts in putname()

1. we already expect the refcount is 1.
2. path creation predicts name == iname

I verified this straightens out the asm, no functional changes.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Link: https://patch.msgid.link/20251029134952.658450-1-mjguzik@gmail.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/fs/namei.c b/fs/namei.c
index 7377020a2cba..1d4d17f24fb2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -282,7 +282,7 @@ void putname(struct filename *name)
 		return;
 
 	refcnt = atomic_read(&name->refcnt);
-	if (refcnt != 1) {
+	if (unlikely(refcnt != 1)) {
 		if (WARN_ON_ONCE(!refcnt))
 			return;
 
@@ -290,7 +290,7 @@ void putname(struct filename *name)
 			return;
 	}
 
-	if (name->name != name->iname) {
+	if (unlikely(name->name != name->iname)) {
 		__putname(name->name);
 		kfree(name);
 	} else