diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 6 | ||||
| -rw-r--r-- | init/initramfs.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index c2de5104aad2..f6d4dd764a52 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -373,7 +373,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data) printk(KERN_INFO "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n", s->s_type->name, - s->s_flags & MS_RDONLY ? " readonly" : "", + sb_rdonly(s) ? " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV)); return 0; } @@ -420,8 +420,8 @@ retry: #endif panic("VFS: Unable to mount root fs on %s", b); } - if (!(flags & MS_RDONLY)) { - flags |= MS_RDONLY; + if (!(flags & SB_RDONLY)) { + flags |= SB_RDONLY; goto retry; } diff --git a/init/initramfs.c b/init/initramfs.c index 8a532050043f..e64bf7b4c1ca 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -110,7 +110,7 @@ static void __init free_hash(void) static long __init do_utime(char *filename, time_t mtime) { - struct timespec t[2]; + struct timespec64 t[2]; t[0].tv_sec = mtime; t[0].tv_nsec = 0; |
