diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /fs/super.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/super.c b/fs/super.c index 2784d6462..7c5d2904c 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1129,17 +1129,16 @@ void __init mount_root(void) 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); |