From: Mike Crowe Check whether the file system was to be mounted read only anyway before warning about changing the mount to read only. Signed-off-by: Mike Crowe Cc: Roman Zippel Signed-off-by: Andrew Morton --- fs/hfsplus/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/hfsplus/super.c~hfsplus-quieten-down-mounting-hfsplus-journaled-fs-read-only fs/hfsplus/super.c --- a/fs/hfsplus/super.c~hfsplus-quieten-down-mounting-hfsplus-journaled-fs-read-only +++ a/fs/hfsplus/super.c @@ -356,7 +356,7 @@ static int hfsplus_fill_super(struct sup } else if (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_SOFTLOCK)) { printk(KERN_WARNING "hfs: Filesystem is marked locked, mounting read-only.\n"); sb->s_flags |= MS_RDONLY; - } else if (vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) { + } else if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_JOURNALED)) && !(sb->s_flags & MS_RDONLY)) { printk(KERN_WARNING "hfs: write access to a journaled filesystem is not supported, " "use the force option at your own risk, mounting read-only.\n"); sb->s_flags |= MS_RDONLY; _