From: Uros Bizjak <ubizjak@gmail.com>
Date: Wed, 21 Dec 2022 19:35:40 +0000 (+0100)
Subject: posix_acl: Use try_cmpxchg in get_acl
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e1da8fe031303599e78f88e0dad9f44272e4f99;p=linux.git

posix_acl: Use try_cmpxchg in get_acl

Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old
in get_acl. x86 CMPXCHG instruction returns success in ZF flag,
so this change saves a compare after cmpxchg (and related move
instruction in front of cmpxchg).

No functional change intended.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
---

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index d7bc81fc08409..420c689e1bec6 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -174,7 +174,7 @@ static struct posix_acl *__get_acl(struct user_namespace *mnt_userns,
 	 * Cache the result, but only if our sentinel is still in place.
 	 */
 	posix_acl_dup(acl);
-	if (unlikely(cmpxchg(p, sentinel, acl) != sentinel))
+	if (unlikely(!try_cmpxchg(p, &sentinel, acl)))
 		posix_acl_release(acl);
 	return acl;
 }