mount.nfs: Move MS_DUMMY and friends to header file

We move the definitions of MS_USER and friends to our local copy of
mount_constants.h.  These will need to be available in nfsmount.c and
nfs4mount.c when we move the mount system call out of mount.c.

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 e3f84a0edb98ad40652ae048160e00545702f4b8..de94e66f75d5971e6641c308968e003cc6c2a13d 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -72,11 +72,6 @@ struct opt_map {
   int  mask;                    /* flag mask value */
 };
 
-/* Custom mount options for our own purposes.  */
-#define MS_DUMMY       0x00000000
-#define MS_USERS       0x40000000
-#define MS_USER                0x80000000
-
 static const struct opt_map opt_map[] = {
   { "defaults", 0, 0, 0         },      /* default options */
   { "ro",       1, 0, MS_RDONLY },      /* read-only */

diff --git a/utils/mount/mount_constants.h b/utils/mount/mount_constants.h
index 19a7bf586769c92370736d96b87bf46de9b9b25d..ff7b3bc229ffeb304a1ecdf35fb5a4ea19dcb3c0 100644 (file)
--- a/utils/mount/mount_constants.h
+++ b/utils/mount/mount_constants.h
@@ -39,6 +39,18 @@ if we have a stack or plain mount - mount atop of it, forming a stack. */
 #ifndef MS_VERBOSE
 #define MS_VERBOSE     0x8000  /* 32768 */
 #endif
+
+/*
+ * NFS fs-specific mount option flags
+ *
+ * MS_DUMMY is assigned to mount options that are not to be
+ * passed to the kernel via the "flags" argument.  These are
+ * generally ignored or handled entirely in user space.
+ */
+#define MS_DUMMY       0x00000000
+#define MS_USERS       0x40000000
+#define MS_USER                0x80000000
+
 /*
  * Magic mount flag number. Had to be or-ed to the flag values.
  */