From b95440ee43b4365800cb9c5f1b323fc4971c83d6 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Wed, 25 Apr 2012 16:56:22 -0400
Subject: [PATCH] --- yaml --- r: 309819 b: refs/heads/master c:
 2355c59644def5950f982fc1509dd45037e79ded h: refs/heads/master i:   309817:
 88606c8af0543b1aad8537efdbe1fcd418f69fb0   309815:
 16a70febc0c373a6a7a271459e0d100015900bc6 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfsd/export.c      | 2 +-
 trunk/fs/nfsd/nfs4recover.c | 2 +-
 trunk/fs/nfsd/nfs4state.c   | 2 +-
 trunk/fs/nfsd/nfs4xdr.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 48d4dc06d4ae..d2bf49bea4b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa4b36525577dfe2b52c7e52e03525aba1b74d3
+refs/heads/master: 2355c59644def5950f982fc1509dd45037e79ded
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index dcb52b884519..ec16364f782e 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -706,7 +706,7 @@ static struct cache_head *svc_export_alloc(void)
 		return NULL;
 }
 
-struct cache_detail svc_export_cache_template = {
+static struct cache_detail svc_export_cache_template = {
 	.owner		= THIS_MODULE,
 	.hash_size	= EXPORT_HASHMAX,
 	.name		= "nfsd.export",
diff --git a/trunk/fs/nfsd/nfs4recover.c b/trunk/fs/nfsd/nfs4recover.c
index 4767429264a2..2b8e9a93fdd5 100644
--- a/trunk/fs/nfsd/nfs4recover.c
+++ b/trunk/fs/nfsd/nfs4recover.c
@@ -1029,7 +1029,7 @@ rpc_pipefs_event(struct notifier_block *nb, unsigned long event, void *ptr)
 	return ret;
 }
 
-struct notifier_block nfsd4_cld_block = {
+static struct notifier_block nfsd4_cld_block = {
 	.notifier_call = rpc_pipefs_event,
 };
 
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index cf26658e4e31..3ccebdc4812c 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -4021,7 +4021,7 @@ static void get_lock_access(struct nfs4_ol_stateid *lock_stp, u32 access)
 	__set_bit(access, &lock_stp->st_access_bmap);
 }
 
-__be32 lookup_or_create_lock_state(struct nfsd4_compound_state *cstate, struct nfs4_ol_stateid *ost, struct nfsd4_lock *lock, struct nfs4_ol_stateid **lst, bool *new)
+static __be32 lookup_or_create_lock_state(struct nfsd4_compound_state *cstate, struct nfs4_ol_stateid *ost, struct nfsd4_lock *lock, struct nfs4_ol_stateid **lst, bool *new)
 {
 	struct nfs4_file *fi = ost->st_file;
 	struct nfs4_openowner *oo = openowner(ost->st_stateowner);
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index bcd8904ab1e3..59c5184e6f0d 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -3399,7 +3399,7 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,
 	return 0;
 }
 
-__be32
+static __be32
 nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, int nfserr,
 			  struct nfsd4_test_stateid *test_stateid)
 {