aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 19:37:51 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 19:58:48 -0400
commitf9d640f3a4f043f7dff66ad7bd8cb29ec145c41d (patch)
treed57a9914d80262324b62ff328d398a0119e88b8a /fs/nfs
parent758201e2c94b7d26ea0ac64e55cab1d53742780a (diff)
NFSv4: nfs4_match_clientids is only used by NFSv4.1
Fix another compiler warning. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4client.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 14ddd4d30966..8466e6046ff5 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -252,21 +252,6 @@ error:
252} 252}
253 253
254/* 254/*
255 * Returns true if the client IDs match
256 */
257static bool nfs4_match_clientids(struct nfs_client *a, struct nfs_client *b)
258{
259 if (a->cl_clientid != b->cl_clientid) {
260 dprintk("NFS: --> %s client ID %llx does not match %llx\n",
261 __func__, a->cl_clientid, b->cl_clientid);
262 return false;
263 }
264 dprintk("NFS: --> %s client ID %llx matches %llx\n",
265 __func__, a->cl_clientid, b->cl_clientid);
266 return true;
267}
268
269/*
270 * SETCLIENTID just did a callback update with the callback ident in 255 * SETCLIENTID just did a callback update with the callback ident in
271 * "drop," but server trunking discovery claims "drop" and "keep" are 256 * "drop," but server trunking discovery claims "drop" and "keep" are
272 * actually the same server. Swap the callback IDs so that "keep" 257 * actually the same server. Swap the callback IDs so that "keep"
@@ -384,6 +369,21 @@ int nfs40_walk_client_list(struct nfs_client *new,
384 369
385#ifdef CONFIG_NFS_V4_1 370#ifdef CONFIG_NFS_V4_1
386/* 371/*
372 * Returns true if the client IDs match
373 */
374static bool nfs4_match_clientids(struct nfs_client *a, struct nfs_client *b)
375{
376 if (a->cl_clientid != b->cl_clientid) {
377 dprintk("NFS: --> %s client ID %llx does not match %llx\n",
378 __func__, a->cl_clientid, b->cl_clientid);
379 return false;
380 }
381 dprintk("NFS: --> %s client ID %llx matches %llx\n",
382 __func__, a->cl_clientid, b->cl_clientid);
383 return true;
384}
385
386/*
387 * Returns true if the server owners match 387 * Returns true if the server owners match
388 */ 388 */
389static bool 389static bool