jbd: fix commit code to properly abort journal (7a266e75) · Commits · 戴 / test

We should really call journal_abort() and not __journal_abort_hard() in case of errors. The latter call does not record the error in the journal superblock and thus filesystem won't be marked as with errors later (and user could happily mount it without any warning). Signed-off-by:

Jan Kara <jack@suse.cz> Cc: <linux-ext4@vger.kernel.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/jbd/commit.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -466,7 +466,7 @@ void journal_commit_transaction(journal_t *journal)
		spin_unlock(&journal->j_list_lock);

		if (err)
		__journal_abort_hard(journal);
		journal_abort(journal, err);

		journal_write_revoke_records(journal, commit_transaction);

		@@ -524,7 +524,7 @@ void journal_commit_transaction(journal_t *journal)

		descriptor = journal_get_descriptor_buffer(journal);
		if (!descriptor) {
		__journal_abort_hard(journal);
		journal_abort(journal, -EIO);
		continue;
		}

		@@ -557,7 +557,7 @@ void journal_commit_transaction(journal_t *journal)
		and repeat this loop: we'll fall into the
		refile-on-abort condition above. */
		if (err) {
		__journal_abort_hard(journal);
		journal_abort(journal, err);
		continue;
		}

		@@ -748,7 +748,7 @@ wait_for_iobuf:
		err = -EIO;

		if (err)
		__journal_abort_hard(journal);
		journal_abort(journal, err);

		/* End of a transaction! Finally, we can do checkpoint
		processing: any buffers committed as a result of this

Admin message