diff options
| author | Jan Kara <jack@suse.cz> | 2012-08-15 13:50:27 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2012-08-15 13:53:30 +0200 |
| commit | 2e84f2641ea91a730642ead558a4ee3bd52310c9 (patch) | |
| tree | 5eece24a86e0648a3ec235694e7f0a50ffb3cbd8 | |
| parent | 48d1788493f874e5d32dccb2911a7bc91c248b4b (diff) | |
jbd: don't write superblock when unmounting an ro filesystem
This sequence:
results in an IO error when unmounting the RO filesystem. The bug was
introduced by:
commit 9754e39c7bc51328f145e933bfb0df47cd67b6e9
Author: Jan Kara <jack@suse.cz>
Date: Sat Apr 7 12:33:03 2012 +0200
jbd: Split updating of journal superblock and marking journal empty
which lost some of the magic in journal_update_superblock() which
used to test for a journal with no outstanding transactions.
This is a port of a jbd2 fix by Eric Sandeen.
CC: <stable@vger.kernel.org> # 3.4.x
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/jbd/journal.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 09357508ec9..a2862339323 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -1113,6 +1113,11 @@ static void mark_journal_empty(journal_t *journal) BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex)); spin_lock(&journal->j_state_lock); + /* Is it already empty? */ + if (sb->s_start == 0) { + spin_unlock(&journal->j_state_lock); + return; + } jbd_debug(1, "JBD: Marking journal as empty (seq %d)\n", journal->j_tail_sequence); |