Skip to contentSkip to conversation

nfs-remove-empty-if-statement-from-nfs3_prepare_get_acl.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Apr 6, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: nfs: remove empty if statement from nfs3_prepare_get_acl
has been removed from the -mm tree. Its filename was
nfs-remove-empty-if-statement-from-nfs3_prepare_get_acl.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Uros Bizjak <[email protected]>
Subject: nfs: remove empty if statement from nfs3_prepare_get_acl
Date: Wed, 30 Nov 2022 16:12:31 +0100

Remove empty if statement from nfs3_prepare_get_acl and update comment to follow the one from the referred fs/posix_acl.c:get_acl().

No functional change intended.

---

 fs/nfs/nfs3acl.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
fs/nfs/nfs3acl.c renamed from fs/nfs/nfs3acl.c~nfs-remove-empty-if-statement-from-nfs3_prepare_get_acl +2 -3
@@ -21,9 +21,8 @@ static void nfs3_prepare_get_acl(struct
 {
 	struct posix_acl *sentinel = uncached_acl_sentinel(current);
 
-	if (cmpxchg(p, ACL_NOT_CACHED, sentinel) != ACL_NOT_CACHED) {
-		/* Not the first reader or sentinel already in place. */
-	}
+	/* If the ACL isn't being read yet, set our sentinel. */
+	cmpxchg(p, ACL_NOT_CACHED, sentinel);
 }
 
 static void nfs3_complete_get_acl(struct posix_acl **p, struct posix_acl *acl)

_

Patches currently in -mm which might be from [email protected] are