[Ocfs2-tools-commits] mfasheh commits r1000 - trunk/mount.ocfs2

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: smushran
Signed-off-by: manish
Signed-off-by: mfasheh
Date: 2005-07-28 18:01:37 -0500 (Thu, 28 Jul 2005)
New Revision: 1000

Modified:
   trunk/mount.ocfs2/mount.ocfs2.c
   trunk/mount.ocfs2/opts.c
   trunk/mount.ocfs2/opts.h
Log:
* Commit a patch by Sunil Mushran to have mount.ocfs2 automatically
  insert _netdev as a mount option.

Signed-off-by: smushran
Signed-off-by: manish
Signed-off-by: mfasheh



Modified: trunk/mount.ocfs2/mount.ocfs2.c
===================================================================
--- trunk/mount.ocfs2/mount.ocfs2.c	2005-07-26 21:50:43 UTC (rev 999)
+++ trunk/mount.ocfs2/mount.ocfs2.c	2005-07-28 23:01:37 UTC (rev 1000)
@@ -343,7 +343,7 @@
 	}
 
 	update_mtab_entry(mo.dev, mo.dir, OCFS2_FS_NAME,
-			  fix_opts_string (mo.flags & ~MS_NOMTAB,
+			  fix_opts_string (((mo.flags & ~MS_NOMTAB) | MS_NETDEV),
 					   mo.xtra_opts, NULL),
 			  mo.flags, 0, 0);
 

Modified: trunk/mount.ocfs2/opts.c
===================================================================
--- trunk/mount.ocfs2/opts.c	2005-07-26 21:50:43 UTC (rev 999)
+++ trunk/mount.ocfs2/opts.c	2005-07-28 23:01:37 UTC (rev 1000)
@@ -61,7 +61,7 @@
   { "noowner",	0, 1, MS_OWNER  },	/* Device owner has no special privs */
   { "group",    0, 0, MS_GROUP  },	/* Let the group of the device mount */
   { "nogroup",  0, 1, MS_GROUP  },	/* Device group has no special privs */
-  { "_netdev",	0, 0, MS_COMMENT},	/* Device accessible only via network */
+  { "_netdev",	0, 0, MS_NETDEV },	/* Device accessible only via network */
   { "comment",  0, 0, MS_COMMENT},	/* fstab comment only (kudzu,_netdev)*/
 
   /* add new options here */

Modified: trunk/mount.ocfs2/opts.h
===================================================================
--- trunk/mount.ocfs2/opts.h	2005-07-26 21:50:43 UTC (rev 999)
+++ trunk/mount.ocfs2/opts.h	2005-07-28 23:01:37 UTC (rev 1000)
@@ -28,11 +28,12 @@
 #define MS_OWNER	0x10000000
 #define MS_GROUP	0x08000000
 #define MS_PAMCONSOLE   0x04000000
+#define MS_NETDEV	0x00040000
 #define MS_COMMENT	0x00020000
 #define MS_LOOP		0x00010000
 
 /* Options that we keep the mount system call from seeing.  */
-#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_LOOP|MS_PAMCONSOLE)
+#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_LOOP|MS_PAMCONSOLE|MS_NETDEV)
 
 /* Options that we keep from appearing in the options field in the mtab.  */
 #define MS_NOMTAB	(MS_REMOUNT|MS_NOAUTO|MS_USERS|MS_USER|MS_PAMCONSOLE)