dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

NFS: Only define some function when v4.1 is enabled 

Now that the nfs4_cb_match_client() function is static, gcc notices that
it is only used when CONFIG_NFS_V4_1 is enabled.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Bryan Schumaker 2012-03-12 11:28:24 -04:00 committed by Trond Myklebust
parent 09acfea5d8
commit 4b7c8dd205
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/client.c
View File

@ -404,6 +404,7 @@ static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1,
(sin1->sin_port == sin2->sin_port); (sin1->sin_port == sin2->sin_port);
} }
#if defined(CONFIG_NFS_V4_1)
/* /*
* Test if two socket addresses represent the same actual socket, * Test if two socket addresses represent the same actual socket,
* by comparing (only) relevant fields, excluding the port number. * by comparing (only) relevant fields, excluding the port number.
@ -422,6 +423,7 @@ static int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1,
} }
return 0; return 0;
} }
#endif /* CONFIG_NFS_V4_1 */
/* /*
* Test if two socket addresses represent the same actual socket, * Test if two socket addresses represent the same actual socket,
@ -442,6 +444,7 @@ static int nfs_sockaddr_cmp(const struct sockaddr *sa1,
return 0; return 0;
} }
#if defined(CONFIG_NFS_V4_1)
/* Common match routine for v4.0 and v4.1 callback services */ /* Common match routine for v4.0 and v4.1 callback services */
static bool nfs4_cb_match_client(const struct sockaddr *addr, static bool nfs4_cb_match_client(const struct sockaddr *addr,
struct nfs_client *clp, u32 minorversion) struct nfs_client *clp, u32 minorversion)
@ -464,6 +467,7 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,
return true; return true;
} }
#endif /* CONFIG_NFS_V4_1 */
/* /*
* Find an nfs_client on the list that matches the initialisation data * Find an nfs_client on the list that matches the initialisation data