From 599f33f8154fdadcbcf3c3110b267ed5f78a014a Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 12 Nov 2012 15:00:54 -0500
Subject: [PATCH] --- yaml --- r: 347647 b: refs/heads/master c:
 772a9bbbb5769c646c74452ef21df538bbe2ebf0 h: refs/heads/master i:   347645:
 812d4aff1eb485cc66a9d5723ddaf4c863b48d1f   347643:
 2087f36de49ccc7506205600947576367f10d834   347639:
 29e4fd11f978b3c6ac3fc400bb77893a2d2cc355   347631:
 8a23dbf717afdac500b7650f469cb5fd3c0a89fe   347615:
 d81dce8e701d2649460e870539d12dbfce420dda   347583:
 8a63ad4fa5e67b89eab57ebcf37526b86897751a   347519:
 66e0c16700dd45b4a80db16638ce7c49272e2362   347391:
 0b19f785dc15d8767cefa3337799cb74f2eba6c8   347135:
 64d6a2696d08ead3878572af667f579b17a119ba v: v3

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

diff --git a/[refs] b/[refs]
index a1d6323ab2cf..e940208eb05e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce30e5392fcb26b6aa53bb16d06da1d7d8bb0863
+refs/heads/master: 772a9bbbb5769c646c74452ef21df538bbe2ebf0
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 24dcda2b327c..1c6f82e4335e 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -4498,22 +4498,22 @@ nfs4_has_reclaimed_state(const char *name)
 /*
  * failure => all reset bets are off, nfserr_no_grace...
  */
-int
+struct nfs4_client_reclaim *
 nfs4_client_to_reclaim(const char *name)
 {
 	unsigned int strhashval;
-	struct nfs4_client_reclaim *crp = NULL;
+	struct nfs4_client_reclaim *crp;
 
 	dprintk("NFSD nfs4_client_to_reclaim NAME: %.*s\n", HEXDIR_LEN, name);
 	crp = alloc_reclaim();
-	if (!crp)
-		return 0;
-	strhashval = clientstr_hashval(name);
-	INIT_LIST_HEAD(&crp->cr_strhash);
-	list_add(&crp->cr_strhash, &reclaim_str_hashtbl[strhashval]);
-	memcpy(crp->cr_recdir, name, HEXDIR_LEN);
-	reclaim_str_hashtbl_size++;
-	return 1;
+	if (crp) {
+		strhashval = clientstr_hashval(name);
+		INIT_LIST_HEAD(&crp->cr_strhash);
+		list_add(&crp->cr_strhash, &reclaim_str_hashtbl[strhashval]);
+		memcpy(crp->cr_recdir, name, HEXDIR_LEN);
+		reclaim_str_hashtbl_size++;
+	}
+	return crp;
 }
 
 void
diff --git a/trunk/fs/nfsd/state.h b/trunk/fs/nfsd/state.h
index 3528616c955e..3f8b26b9b47b 100644
--- a/trunk/fs/nfsd/state.h
+++ b/trunk/fs/nfsd/state.h
@@ -482,7 +482,7 @@ extern void nfsd4_destroy_callback_queue(void);
 extern void nfsd4_shutdown_callback(struct nfs4_client *);
 extern void nfs4_put_delegation(struct nfs4_delegation *dp);
 extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname);
-extern int nfs4_client_to_reclaim(const char *name);
+extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(const char *name);
 extern int nfs4_has_reclaimed_state(const char *name);
 extern void release_session_client(struct nfsd4_session *);
 extern void nfsd4_purge_closed_stateid(struct nfs4_stateowner *);