libnfs.a: move more mount-only functions out of libnfs.a

Continue clean-up with nfsvers_to_mnt() and mntvers_to_nfs().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/support/include/conn.h b/support/include/conn.h
index f21c10e18a8ea83312946fc42b3e0f4d43e2a0bd..48f5a1c97a25006c9b8bfe0f13fb649a9e1943b1 100644 (file)
--- a/support/include/conn.h
+++ b/support/include/conn.h
@@ -30,8 +30,6 @@ static const struct timeval RETRY_TIMEOUT = { 3, 0 };
 
 int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int,
              struct sockaddr_in *);
-u_long nfsvers_to_mnt(const u_long);
-u_long mntvers_to_nfs(const u_long);
 int get_socket(struct sockaddr_in *, u_int, int, int);
 
 #endif /* _CONN_H */

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
index cf080c26e8cb61187f32c6de9c72c1cdc290287e..970abfe38025d3031cf0ec1c547c931226afecd8 100644 (file)
--- a/support/nfs/conn.c
+++ b/support/nfs/conn.c
@@ -25,24 +25,6 @@
 
 extern int verbose;
 
-/* Map an NFS version into the corresponding Mountd version */
-u_long nfsvers_to_mnt(const u_long vers)
-{
-       static const u_long nfs_to_mnt[] = { 0, 0, 1, 3 };
-       if (vers <= 3)
-               return nfs_to_mnt[vers];
-       return 0;
-}
-
-/* Map a Mountd version into the corresponding NFS version */
-u_long mntvers_to_nfs(const u_long vers)
-{
-       static const u_long mnt_to_nfs[] = { 0, 2, 2, 3 };
-       if (vers <= 3)
-               return mnt_to_nfs[vers];
-       return 0;
-}
-
 /*
  * Create a socket that is locally bound to a 
  * reserve or non-reserve port. For any failures,

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 08b1f99f458f0baa894c98fc82bb152f2a69b028..c092571044b0c31d61cec3f7862c16a93c8f8650 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -57,6 +57,40 @@ extern int nfs_mount_data_version;
 extern char *progname;
 extern int verbose;
 
+static const unsigned long nfs_to_mnt[] = {
+       0,
+       0,
+       1,
+       3,
+};
+
+static const unsigned long mnt_to_nfs[] = {
+       0,
+       2,
+       2,
+       3,
+};
+
+/*
+ * Map an NFS version into the corresponding Mountd version
+ */
+unsigned long nfsvers_to_mnt(const unsigned long vers)
+{
+       if (vers <= 3)
+               return nfs_to_mnt[vers];
+       return 0;
+}
+
+/*
+ * Map a Mountd version into the corresponding NFS version
+ */
+static unsigned long mntvers_to_nfs(const unsigned long vers)
+{
+       if (vers <= 3)
+               return mnt_to_nfs[vers];
+       return 0;
+}
+
 static const unsigned int probe_udp_only[] = {
        IPPROTO_UDP,
        0,

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 81a59da9136a995733483eb9a337b680d53bcdb1..b3a5525792120432e7205fa9c78988fc20c43033 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -33,5 +33,7 @@ int nfs_call_umount(clnt_addr_t *, dirpath *);
 
 int start_statd(void);
 
+unsigned long nfsvers_to_mnt(const unsigned long);
+
 CLIENT *mnt_openclnt(clnt_addr_t *, int *);
 void mnt_closeclnt(CLIENT *, int);