diff --git a/[refs] b/[refs]
index 14d1ee0adff3..c70e6232ff14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 135ae8270d233067c8be426e2a59d0733ba74723
+refs/heads/master: 2b4cf668a7b8f84182a35f07152d8b6f012629d2
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index 7bb187ac1492..996847023015 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -642,7 +642,7 @@ int set_callback_cred(void)
 	return 0;
 }
 
-struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc_clnt *client, struct nfsd4_session *ses)
+static struct rpc_cred *get_backchannel_cred(struct nfs4_client *clp, struct rpc_clnt *client, struct nfsd4_session *ses)
 {
 	if (clp->cl_minorversion == 0) {
 		return get_rpccred(callback_cred);