libnfs.a: eliminate conn.c and conn.h
authorChuck Lever <chuck.lever@oracle.com>
Sat, 28 Jul 2007 21:50:55 +0000 (17:50 -0400)
committerNeil Brown <neilb@suse.de>
Mon, 30 Jul 2007 06:12:54 +0000 (16:12 +1000)
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>
support/include/Makefile.am
support/include/conn.h [deleted file]
support/nfs/Makefile.am
support/nfs/conn.c [deleted file]
utils/mount/network.c
utils/mount/network.h
utils/mount/nfs4mount.c
utils/mount/nfsmount.c
utils/mount/nfsumount.c

index a99882c..69c4503 100644 (file)
@@ -3,7 +3,6 @@
 SUBDIRS = nfs rpcsvc sys
 
 noinst_HEADERS = \
-       conn.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
+++ /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 */
-
index 6006df6..82353a9 100644 (file)
@@ -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 \
-                  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
 
diff --git a/support/nfs/conn.c b/support/nfs/conn.c
deleted file mode 100644 (file)
index db9185d..0000000
+++ /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"
-
index af37ef6..efedf25 100644 (file)
@@ -34,7 +34,6 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
-#include "conn.h"
 #include "xcommon.h"
 #include "mount.h"
 #include "nls.h"
index 0f24a32..2e4dbbc 100644 (file)
  *
  */
 
-#include "conn.h"
+#include <rpc/pmap_prot.h>
+#include <rpc/clnt.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)
 
+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 *);
index 52b0261..e1b2c3b 100644 (file)
@@ -39,7 +39,6 @@
 
 #include "pseudoflavors.h"
 #include "nls.h"
-#include "conn.h"
 #include "xcommon.h"
 
 #include "mount_constants.h"
index 49d6f3c..bd3403c 100644 (file)
@@ -56,7 +56,6 @@
 #include <paths.h>
 #include <syslog.h>
 
-#include "conn.h"
 #include "xcommon.h"
 #include "mount.h"
 #include "nfs_mount.h"
index 86fb6a2..0c66717 100644 (file)
@@ -29,7 +29,6 @@
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"
-#include "conn.h"
 
 #include "mount_constants.h"
 #include "mount.h"