aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 16:37:51 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 16:58:48 -0700
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 14ddd4d3096..8466e6046ff 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -252,21 +252,6 @@ error:
}
/*
- * Returns true if the client IDs match
- */
-static bool nfs4_match_clientids(struct nfs_client *a, struct nfs_client *b)
-{
- if (a->cl_clientid != b->cl_clientid) {
- dprintk("NFS: --> %s client ID %llx does not match %llx\n",
- __func__, a->cl_clientid, b->cl_clientid);
- return false;
- }
- dprintk("NFS: --> %s client ID %llx matches %llx\n",
- __func__, a->cl_clientid, b->cl_clientid);
- return true;
-}
-
-/*
* SETCLIENTID just did a callback update with the callback ident in
* "drop," but server trunking discovery claims "drop" and "keep" are
* actually the same server. Swap the callback IDs so that "keep"
@@ -384,6 +369,21 @@ int nfs40_walk_client_list(struct nfs_client *new,
#ifdef CONFIG_NFS_V4_1
/*
+ * Returns true if the client IDs match
+ */
+static bool nfs4_match_clientids(struct nfs_client *a, struct nfs_client *b)
+{
+ if (a->cl_clientid != b->cl_clientid) {
+ dprintk("NFS: --> %s client ID %llx does not match %llx\n",
+ __func__, a->cl_clientid, b->cl_clientid);
+ return false;
+ }
+ dprintk("NFS: --> %s client ID %llx matches %llx\n",
+ __func__, a->cl_clientid, b->cl_clientid);
+ return true;
+}
+
+/*
* Returns true if the server owners match
*/
static bool