behavior as file systems that use the monolithic /sbin/mount command.

See the MS_NOMTAB macro in utils-linux-ng/mount/mount.c.

Note that mount(8) has MS_USERS and MS_USER in the "nomtab" category
as well, but mount.nfs needs to record those values so that unmounting
a user-mounted NFS file system can work.

While we're here, fix some white space damage in fix_opts_string().

This is a partial fix for:

  https://bugzilla.linux-nfs.org/show_bug.cgi?id=188

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 2909595b5926d63501c5dbf970e7372d19ace231..b4da21faa74508160ffde358ed96dd40074f3de6 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -209,7 +209,7 @@ static char *fix_opts_string(int flags, const char *extra_opts)
        }
        if (flags & MS_USERS)
                new_opts = xstrconcat3(new_opts, ",users", "");
        }
        if (flags & MS_USERS)
                new_opts = xstrconcat3(new_opts, ",users", "");

-       
+

        for (om = opt_map; om->opt != NULL; om++) {
                if (om->skip)
                        continue;
        for (om = opt_map; om->opt != NULL; om++) {
                if (om->skip)
                        continue;


@@ -281,7 +281,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
        ment.mnt_fsname = spec;
        ment.mnt_dir = mount_point;
        ment.mnt_type = fstype;
        ment.mnt_fsname = spec;
        ment.mnt_dir = mount_point;
        ment.mnt_type = fstype;

-       ment.mnt_opts = fix_opts_string(flags, opts);
+       ment.mnt_opts = fix_opts_string(flags & ~MS_NOMTAB, opts);

        ment.mnt_freq = freq;
        ment.mnt_passno = pass;
 
        ment.mnt_freq = freq;
        ment.mnt_passno = pass;
 

diff --git a/utils/mount/mount_constants.h b/utils/mount/mount_constants.h
index cbfb099df99a0458fcd12ff0d180573a78814bdf..4d050d8819e4953a8f79c69c2a3a245ce70c2b5f 100644 (file)
--- a/utils/mount/mount_constants.h
+++ b/utils/mount/mount_constants.h
@@ -64,4 +64,8 @@ if we have a stack or plain mount - mount atop of it, forming a stack. */
 #define MS_MGC_MSK 0xffff0000  /* magic flag number mask */
 #endif
 
 #define MS_MGC_MSK 0xffff0000  /* magic flag number mask */
 #endif
 

+/* Generic options that are prevented from appearing
+ * in the options field in /etc/mtab. */
+#define MS_NOMTAB      (MS_REMOUNT)
+

 #endif /* _NFS_UTILS_MOUNT_CONSTANTS_H */
 #endif /* _NFS_UTILS_MOUNT_CONSTANTS_H */