umount.nfs: eliminate a nearly empty header file.

Clean-up: move nfsumount() global declaration to nfs_mount.h, and remove
nfsumount.h.

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 64a2b75fd68cc949f2e98cc6fb4904b91e497309..d6d527cc5cb7d5d531c72123dbd51e461dcab1dc 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -39,7 +39,6 @@
 
 #include "nfs_mount.h"
 #include "nfs4_mount.h"
-#include "nfsumount.h"
 #include "mount.h"
 #include "error.h"
 #include "network.h"

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 12fc7620877b11eb6d8e84e042302a445b42f465..21cf4efe72c646b2d26acca4ba038dde23962ca5 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -38,7 +38,6 @@
 #include "xcommon.h"
 #include "mount.h"
 #include "nls.h"
-#include "nfsumount.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
 #include "network.h"

diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h
index 279ff3691f1dec8075f656952d00d307d39720b9..dcce3702995865d27abd04aa144f32c46ccc126f 100644 (file)
--- a/utils/mount/nfs_mount.h
+++ b/utils/mount/nfs_mount.h
@@ -80,6 +80,7 @@ struct nfs_mount_data {
 #define AUTH_GSS_SPKMP         390011
 #endif
 
-int nfsmount(const char *, const char *, int , char **, int);
+int    nfsmount(const char *, const char *, int , char **, int);
+int    nfsumount(int, char **);
 
 #endif /* _NFS_MOUNT_H */

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 6371d77e4d43ec718d3fa749fd25d4cd02ed636a..49d6f3c875f9ca2bb0b798880514600a8c997cd5 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -59,7 +59,6 @@
 #include "conn.h"
 #include "xcommon.h"
 #include "mount.h"
-#include "nfsumount.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
 #include "nls.h"

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index a15e5245e52473bc10b529c2ff96157d95e6b523..86fb6a206ce46407f6c668e039305746463a51a6 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -33,7 +33,6 @@
 
 #include "mount_constants.h"
 #include "mount.h"
-#include "nfsumount.h"
 #include "error.h"
 #include "network.h"
 

diff --git a/utils/mount/nfsumount.h b/utils/mount/nfsumount.h
deleted file mode 100644 (file)
index 0d67d27..0000000
--- a/utils/mount/nfsumount.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _NFS_UMOUNT_H
-#define _NFS_UMOUNT_H
-
-#include "conn.h"
-#include "mount.h"
-
-int nfsumount(int, char **);
-
-#endif