diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2012-12-25 14:08:16 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:50:53 -0800 |
| commit | bd06aeb0ff9b22598851276403a1e90f0b4c2d38 (patch) | |
| tree | ddf4a7d1ddcdc639c95112784f918f84cdea6bbc /fs/ext4 | |
| parent | b5f0e251211531180989a32ba598968104562c84 (diff) | |
| download | linux-3.10-bd06aeb0ff9b22598851276403a1e90f0b4c2d38.tar.gz linux-3.10-bd06aeb0ff9b22598851276403a1e90f0b4c2d38.tar.bz2 linux-3.10-bd06aeb0ff9b22598851276403a1e90f0b4c2d38.zip | |
ext4: do not try to write superblock on ro remount w/o journal
commit d096ad0f79a782935d2e06ae8fb235e8c5397775 upstream.
When a journal-less ext4 filesystem is mounted on a read-only block
device (blockdev --setro will do), each remount (for other, unrelated,
flags, like suid=>nosuid etc) results in a series of scary messages
from kernel telling about I/O errors on the device.
This is becauese of the following code ext4_remount():
if (sbi->s_journal == NULL)
ext4_commit_super(sb, 1);
at the end of remount procedure, which forces writing (flushing) of
a superblock regardless whenever it is dirty or not, if the filesystem
is readonly or not, and whenever the device itself is readonly or not.
We only need call ext4_commit_super when the file system had been
previously mounted read/write.
Thanks to Eric Sandeen for help in diagnosing this issue.
Signed-off-By: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9e4177d6905..889577332ba 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4506,7 +4506,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) } ext4_setup_system_zone(sb); - if (sbi->s_journal == NULL) + if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY)) ext4_commit_super(sb, 1); #ifdef CONFIG_QUOTA |