2012-03-12 15:28:26

by Anna Schumaker

[permalink] [raw]
Subject: [PATCH] NFS: Only define some function when v4.1 is enabled

From: Bryan Schumaker <[email protected]>

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 <[email protected]>
---
fs/nfs/client.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 38e16a2..ec31a0a 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -380,6 +380,7 @@ static int nfs_sockaddr_cmp_ip4(const struct sockaddr *sa1,
(sin1->sin_port == sin2->sin_port);
}

+#if defined(CONFIG_NFS_V4_1)
/*
* Test if two socket addresses represent the same actual socket,
* by comparing (only) relevant fields, excluding the port number.
@@ -398,6 +399,7 @@ static int nfs_sockaddr_match_ipaddr(const struct sockaddr *sa1,
}
return 0;
}
+#endif /* CONFIG_NFS_V4_1 */

/*
* Test if two socket addresses represent the same actual socket,
@@ -418,6 +420,7 @@ static int nfs_sockaddr_cmp(const struct sockaddr *sa1,
return 0;
}

+#if defined(CONFIG_NFS_V4_1)
/* Common match routine for v4.0 and v4.1 callback services */
static bool nfs4_cb_match_client(const struct sockaddr *addr,
struct nfs_client *clp, u32 minorversion)
@@ -440,6 +443,7 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,

return true;
}
+#endif /* CONFIG_NFS_V4_1 */

/*
* Find an nfs_client on the list that matches the initialisation data
--
1.7.9.2