From 85026bafd9f94c9882af8f62eef0461d99bfae4c Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Fri, 1 Feb 2013 03:38:35 -0800
Subject: [PATCH] --- yaml --- r: 357822 b: refs/heads/master c:
 6c1810e040d87fcd8fc95aedfd2ef6979d71e517 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfsd/acl.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a848a8959e4e..dd3c40f22e61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4277bbf750d95a4c86925fa8f8956568b4912d43
+refs/heads/master: 6c1810e040d87fcd8fc95aedfd2ef6979d71e517
diff --git a/trunk/fs/nfsd/acl.h b/trunk/fs/nfsd/acl.h
index 34e5c40af5ef..8b186a4955cc 100644
--- a/trunk/fs/nfsd/acl.h
+++ b/trunk/fs/nfsd/acl.h
@@ -44,8 +44,6 @@
 struct nfs4_acl *nfs4_acl_new(int);
 int nfs4_acl_get_whotype(char *, u32);
 int nfs4_acl_write_who(int who, char *p);
-int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
-		                        uid_t who, u32 mask);
 
 #define NFS4_ACL_TYPE_DEFAULT	0x01
 #define NFS4_ACL_DIR		0x02