From 1419949aa62e12c0ce7d4fbad06f6def5c3cba73 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Wed, 9 Jan 2013 12:38:34 +0300
Subject: [PATCH] --- yaml --- r: 359706 b: refs/heads/master c:
 bca0ec6511bb96bcb6cb247fd4100a4ea1d1e4f5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f96b53236000..289be2ed919e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35525b79786b2ba58ef13822198ce22c497bc7a2
+refs/heads/master: bca0ec6511bb96bcb6cb247fd4100a4ea1d1e4f5
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index cc41bf4bcab2..4db46aa387b7 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1048,7 +1048,7 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)
 static inline void
 free_client(struct nfs4_client *clp)
 {
-	struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);
+	struct nfsd_net __maybe_unused *nn = net_generic(clp->net, nfsd_net_id);
 
 	lockdep_assert_held(&nn->client_lock);
 	while (!list_empty(&clp->cl_sessions)) {