From 890017411a489d1758006d5b0167b46812b98b4c Mon Sep 17 00:00:00 2001
From: Frank Filz <ffilzlnx@us.ibm.com>
Date: Fri, 14 Aug 2009 15:02:30 -0700
Subject: [PATCH] --- yaml --- r: 164614 b: refs/heads/master c:
 55bb55dca0cecac2fb7b8c743db41361c011c8a8 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs4acl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eca43b012844..13b64d190a6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f55f3c0a013c42fb733997da54a3326c74601e8
+refs/heads/master: 55bb55dca0cecac2fb7b8c743db41361c011c8a8
diff --git a/trunk/fs/nfsd/nfs4acl.c b/trunk/fs/nfsd/nfs4acl.c
index 54b8b4140c8f..5320c2b6c7a6 100644
--- a/trunk/fs/nfsd/nfs4acl.c
+++ b/trunk/fs/nfsd/nfs4acl.c
@@ -335,7 +335,7 @@ _posix_to_nfsv4_one(struct posix_acl *pacl, struct nfs4_acl *acl,
 		if (deny) {
 			ace->type = NFS4_ACE_ACCESS_DENIED_ACE_TYPE;
 			ace->flag = eflag | NFS4_ACE_IDENTIFIER_GROUP;
-			ace->access_mask = mask_from_posix(deny, flags);
+			ace->access_mask = deny_mask_from_posix(deny, flags);
 			ace->whotype = NFS4_ACL_WHO_NAMED;
 			ace->who = pa->e_id;
 			ace++;