Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81a73719 authored by Mike Crowe's avatar Mike Crowe Committed by Linus Torvalds
Browse files

hfsplus: quieten down mounting hfsplus journaled fs read only 



Check whether the file system was to be mounted read only anyway before
warning about changing the mount to read only.

Signed-off-by: default avatarMike Crowe <mac@mcrowe.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 152b95a1

fs/hfsplus/super.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) 
	} 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;