Commit 91bc559d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents ea5aac6f 4e1da8fe

fs/posix_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}