Merge tag 'fs.acl.v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping

91bc559d · Linus Torvalds <[email protected]> · 2023-02-20 12:14:33 -08:00

Pull vfs acl update from Christian Brauner:
 "This contains a single update to the internal get acl method and
  replaces an open-coded cmpxchg() comparison with with try_cmpxchg().

  It's clearer and also beneficial on some architectures"

* tag 'fs.acl.v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping:
  posix_acl: Use try_cmpxchg in get_acl

Commit: 91bc559d8d3aed488b4b50e9eba1d7ebb1da7bbf
Parents: ea5aac6f · 4e1da8fe

Merge commit. Changes below are compared with the first parent: ea5aac6f.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/posix_acl.c	modified	+1	−1	View file

fs/posix_acl.c

View file

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index fda1670..5a76fb3 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -175,7 +175,7 @@ static struct posix_acl *__get_acl(struct mnt_idmap *idmap,
 	 * 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;
 }