umount.nfs: eliminate a nearly empty header file.
authorChuck Lever <chuck.lever@oracle.com>
Sat, 28 Jul 2007 21:50:14 +0000 (17:50 -0400)
committerNeil Brown <neilb@suse.de>
Mon, 30 Jul 2007 06:12:53 +0000 (16:12 +1000)
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>
utils/mount/mount.c
utils/mount/network.c
utils/mount/nfs_mount.h
utils/mount/nfsmount.c
utils/mount/nfsumount.c
utils/mount/nfsumount.h [deleted file]

index 64a2b75..d6d527c 100644 (file)
@@ -39,7 +39,6 @@
 
 #include "nfs_mount.h"
 #include "nfs4_mount.h"
-#include "nfsumount.h"
 #include "mount.h"
 #include "error.h"
 #include "network.h"
index 12fc762..21cf4ef 100644 (file)
@@ -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"
index 279ff36..dcce370 100644 (file)
@@ -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 */
index 6371d77..49d6f3c 100644 (file)
@@ -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"
index a15e524..86fb6a2 100644 (file)
@@ -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
+++ /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