From 0a18cb68af839db7dbc31f54500e27ad5526c4fe Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 27 Jul 2012 14:16:05 -0400
Subject: [PATCH] --- yaml --- r: 334035 b: refs/heads/master c:
 9c0b0ff79935c7e18b2f2f0d66de7086f57c077b h: refs/heads/master i:   334033:
 91746629d0a7cc9e3061aa8c8b0fde869a67e6cd   334031:
 21bc151dc3d3c08950edf5dc87bef80d5d572672 v: v3

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

diff --git a/[refs] b/[refs]
index da9a6ff44c8f..f2bea312cc4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1696c47ce2f42e671f6a17682b533273f4ac7963
+refs/heads/master: 9c0b0ff79935c7e18b2f2f0d66de7086f57c077b
diff --git a/trunk/fs/nfsd/nfs2acl.c b/trunk/fs/nfsd/nfs2acl.c
index 6aa5590c3679..b314888825d5 100644
--- a/trunk/fs/nfsd/nfs2acl.c
+++ b/trunk/fs/nfsd/nfs2acl.c
@@ -218,8 +218,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p,
  * There must be an encoding function for void results so svc_process
  * will work properly.
  */
-int
-nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy)
+static int nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy)
 {
 	return xdr_ressize_check(rqstp, p);
 }