From: Trond Myklebust Date: Mon, 1 Oct 2012 23:37:51 +0000 (-0700) Subject: NFSv4: nfs4_match_clientids is only used by NFSv4.1 X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f9d640f3a4f043f7dff66ad7bd8cb29ec145c41d;p=deliverable%2Flinux.git NFSv4: nfs4_match_clientids is only used by NFSv4.1 Fix another compiler warning. Signed-off-by: Trond Myklebust --- 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 @@ -251,21 +251,6 @@ error: return ERR_PTR(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 @@ -383,6 +368,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 */