Clean up: Include the bare minimum of legacy RPC headers in

utils/mount/network.h.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 5fd57057705ad69f62a1c9fdb9719097f5485aa5..5c9d3f2f69a3952131516d44fac8d6b4e202cf5a 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -35,8 +35,6 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <rpc/rpc.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <rpc/rpc.h>

-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index d0eb1a04cd65d752df79c82eb2c32298837db56c..06e2804f3cff43580a96888fab32f59290b73964 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -44,7 +44,6 @@
 #include "nfs4_mount.h"
 #include "mount.h"
 #include "error.h"
 #include "nfs4_mount.h"
 #include "mount.h"
 #include "error.h"

-#include "network.h"

 #include "stropts.h"
 #include "version.h"
 
 #include "stropts.h"
 #include "version.h"
 

diff --git a/utils/mount/network.c b/utils/mount/network.c
index d8e6e103c762d0eea573f4dd4bd0b46d007173ea..7d3d09aacdfca9ce9992caf788fc6b214e68a61f 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -48,17 +48,6 @@
 #include "mount_constants.h"
 #include "network.h"
 
 #include "mount_constants.h"
 #include "network.h"
 

-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
-#endif
-
-#ifndef NFS_PORT
-#define NFS_PORT 2049
-#endif
-

 #define PMAP_TIMEOUT   (10)
 #define CONNECT_TIMEOUT        (20)
 #define MOUNT_TIMEOUT  (30)
 #define PMAP_TIMEOUT   (10)
 #define CONNECT_TIMEOUT        (20)
 #define MOUNT_TIMEOUT  (30)

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 544ac93ee5ca9efc1678c3de4d6efe5f0fb5d60d..a4dba1b69e3a314a4b544b561e0f7b3ad0aeedfd 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -25,16 +25,6 @@
 #define _NFS_UTILS_MOUNT_NETWORK_H
 
 #include <rpc/pmap_prot.h>
 #define _NFS_UTILS_MOUNT_NETWORK_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)
 
 #define MNT_SENDBUFSIZE (2048U)
 #define MNT_RECVBUFSIZE (1024U)

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 2b0fe2e30c50de63b1a2c92b2ef69440e6760c06..a2f318fa47da13b3af4885ee514bd7d6e1fc7703 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -34,6 +34,7 @@
 #include <arpa/inet.h>
 #include <rpc/auth.h>
 #include <rpc/rpc.h>
 #include <arpa/inet.h>
 #include <rpc/auth.h>
 #include <rpc/rpc.h>

+

 #ifdef HAVE_RPCSVC_NFS_PROT_H
 #include <rpcsvc/nfs_prot.h>
 #else
 #ifdef HAVE_RPCSVC_NFS_PROT_H
 #include <rpcsvc/nfs_prot.h>
 #else


@@ -45,6 +46,7 @@
 #include "nls.h"
 #include "xcommon.h"
 
 #include "nls.h"
 #include "xcommon.h"
 

+#include "mount.h"

 #include "mount_constants.h"
 #include "nfs4_mount.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
 #include "nfs4_mount.h"
 #include "nfs_mount.h"

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index b343a1f07a216643f11a5ef3aec9614735a31014..6355681d4b520eeb3bdeacb26ed81cf797ea33cc 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -69,6 +69,13 @@
 #include "network.h"
 #include "version.h"
 
 #include "network.h"
 #include "version.h"
 

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

 #ifndef NFS_PORT
 #define NFS_PORT 2049
 #endif
 #ifndef NFS_PORT
 #define NFS_PORT 2049
 #endif