patch-2.2.0-pre6 linux/fs/super.c

Next file: linux/fs/ufs/dir.c
Previous file: linux/fs/nfsd/stats.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre5/linux/fs/super.c linux/fs/super.c
@@ -1129,17 +1129,16 @@
 		if ((fs_type = get_fs_type("nfs"))) {
 			sb = get_empty_super(); /* "can't fail" */
 			sb->s_dev = get_unnamed_dev();
-			sb->s_flags = root_mountflags & ~MS_RDONLY;
+			sb->s_flags = root_mountflags;
 			vfsmnt = add_vfsmnt(sb, "/dev/root", "/");
 			if (vfsmnt) {
 				if (nfs_root_mount(sb) >= 0) {
-					sb->s_rd_only = 0;
 					sb->s_dirt = 0;
 					sb->s_type = fs_type;
 					current->fs->root = dget(sb->s_root);
 					current->fs->pwd = dget(sb->s_root);
 					ROOT_DEV = sb->s_dev;
-					printk (KERN_NOTICE "VFS: Mounted root (nfs filesystem).\n");
+			                printk (KERN_NOTICE "VFS: Mounted root (NFS filesystem)%s.\n", (sb->s_flags & MS_RDONLY) ? " readonly" : "");
 					return;
 				}
 				remove_vfsmnt(sb->s_dev);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov