From 44a38408642ae5fef558549914b0c5c438f5d490 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Wed, 15 Oct 2008 22:04:05 -0700 Subject: [PATCH] --- yaml --- r: 114882 b: refs/heads/master c: 81a73719d1bc77774f6ac91e2476f22c56f18baf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/hfsplus/super.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81995c3a7b9e..b954e936c216 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 152b95a1ed499075006cc6552ef49407deeb815b +refs/heads/master: 81a73719d1bc77774f6ac91e2476f22c56f18baf diff --git a/trunk/fs/hfsplus/super.c b/trunk/fs/hfsplus/super.c index e834e578c93f..eb74531a0a8e 100644 --- a/trunk/fs/hfsplus/super.c +++ b/trunk/fs/hfsplus/super.c @@ -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;