libnfs.a: eliminate conn.c and conn.h

conn.[ch] are now no longer needed.  Clean them out and delete them.

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

diff --git a/support/include/Makefile.am b/support/include/Makefile.am
index a99882ce9c9c249493a7a73c9c6715167db08215..69c4503bb3d7e7f76f920ee235a0375c709100c7 100644 (file)
--- a/support/include/Makefile.am
+++ b/support/include/Makefile.am
@@ -3,7 +3,6 @@
 SUBDIRS = nfs rpcsvc sys
 
 noinst_HEADERS = \
 SUBDIRS = nfs rpcsvc sys
 
 noinst_HEADERS = \

-       conn.h \

        exportfs.h \
        fstab.h \
        ha-callout.h \
        exportfs.h \
        fstab.h \
        ha-callout.h \

diff --git a/support/include/conn.h b/support/include/conn.h
deleted file mode 100644 (file)
index 2b1f07d..0000000
--- a/support/include/conn.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * conn.h -- Connection routines for NFS mount / umount code.
- *
- * 2006-06-06 Amit Gud <agud@redhat.com>
- * - Moved code snippets here from util-linux/mount
- */
-
-#ifndef _CONN_H
-#define _CONN_H
-
-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
-#endif
-
-#include <rpc/pmap_prot.h>
-#include <rpc/clnt.h>
-
-typedef struct {
-       char **hostname;
-       struct sockaddr_in saddr;
-       struct pmap pmap;
-} clnt_addr_t;
-
-/* RPC call timeout values */
-static const struct timeval TIMEOUT = { 20, 0 };
-static const struct timeval RETRY_TIMEOUT = { 3, 0 };
-
-#endif /* _CONN_H */
-

diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am
index 6006df63c5d7f36964a3f3daad01fb86b70b686f..82353a9fe1d6f7f5bb8eb94934b37a440d7b1761 100644 (file)
--- a/support/nfs/Makefile.am
+++ b/support/nfs/Makefile.am
@@ -4,7 +4,7 @@ noinst_LIBRARIES = libnfs.a
 libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
                   xlog.c xcommon.c wildmat.c nfssvc.c nfsclient.c \
                   nfsexport.c getfh.c nfsctl.c \
 libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
                   xlog.c xcommon.c wildmat.c nfssvc.c nfsclient.c \
                   nfsexport.c getfh.c nfsctl.c \

-                  svc_socket.c cacheio.c closeall.c conn.c fstab.c nfs_mntent.c
+                  svc_socket.c cacheio.c closeall.c fstab.c nfs_mntent.c

 
 MAINTAINERCLEANFILES = Makefile.in
 
 
 MAINTAINERCLEANFILES = Makefile.in
 

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
deleted file mode 100644 (file)
index db9185d..0000000
--- a/support/nfs/conn.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * conn.c -- NFS client mount / umount connection code support functions
- *
- * 2006-06-06 Amit Gud <agud@redhat.com>
- * - Moved code snippets to nfs-utils/support/nfs from util-linux/mount/nfsmount.c
- *
- */
-
-#include "config.h"
-#include <errno.h>
-#include <unistd.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "conn.h"
-

diff --git a/utils/mount/network.c b/utils/mount/network.c
index af37ef62f06a9f26de7b9390f69aeb37428e53b1..efedf25462f89d0989e0903ec6634b0500e090b9 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -34,7 +34,6 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 

-#include "conn.h"

 #include "xcommon.h"
 #include "mount.h"
 #include "nls.h"
 #include "xcommon.h"
 #include "mount.h"
 #include "nls.h"

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 0f24a32b7a011c9df7c5a6e8eb9d1ccfaea2e757..2e4dbbc578ed370682ce1d72acdeaf9ec59275e1 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -21,12 +21,31 @@
  *
  */
 
  *
  */
 

-#include "conn.h"
+#include <rpc/pmap_prot.h>
+#include <rpc/clnt.h>
+

 #include "mount.h"
 
 #include "mount.h"
 

+#ifdef HAVE_RPCSVC_NFS_PROT_H
+#include <rpcsvc/nfs_prot.h>
+#else
+#include <linux/nfs.h>
+#define nfsstat nfs_stat
+#endif
+

 #define MNT_SENDBUFSIZE (2048U)
 #define MNT_RECVBUFSIZE (1024U)
 
 #define MNT_SENDBUFSIZE (2048U)
 #define MNT_RECVBUFSIZE (1024U)
 

+typedef struct {
+       char **hostname;
+       struct sockaddr_in saddr;
+       struct pmap pmap;
+} clnt_addr_t;
+
+/* RPC call timeout values */
+static const struct timeval TIMEOUT = { 20, 0 };
+static const struct timeval RETRY_TIMEOUT = { 3, 0 };
+

 int probe_bothports(clnt_addr_t *, clnt_addr_t *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
 int nfs_call_umount(clnt_addr_t *, dirpath *);
 int probe_bothports(clnt_addr_t *, clnt_addr_t *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
 int nfs_call_umount(clnt_addr_t *, dirpath *);

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 52b0261a6038fd6e6bf411a01fd4e28a7770fd2d..e1b2c3b557eb2fa0372e72746d77257c9f3fc626 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -39,7 +39,6 @@
 
 #include "pseudoflavors.h"
 #include "nls.h"
 
 #include "pseudoflavors.h"
 #include "nls.h"

-#include "conn.h"

 #include "xcommon.h"
 
 #include "mount_constants.h"
 #include "xcommon.h"
 
 #include "mount_constants.h"

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 49d6f3c875f9ca2bb0b798880514600a8c997cd5..bd3403c33ec4c8cacf7f8ce0d40dc2444d6d643c 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -56,7 +56,6 @@
 #include <paths.h>
 #include <syslog.h>
 
 #include <paths.h>
 #include <syslog.h>
 

-#include "conn.h"

 #include "xcommon.h"
 #include "mount.h"
 #include "nfs_mount.h"
 #include "xcommon.h"
 #include "mount.h"
 #include "nfs_mount.h"

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 86fb6a206ce46407f6c668e039305746463a51a6..0c667176f7ca325b84e99930c87517c19c13f649 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -29,7 +29,6 @@
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"

-#include "conn.h"

 
 #include "mount_constants.h"
 #include "mount.h"
 
 #include "mount_constants.h"
 #include "mount.h"