2007-10-19 22:49:44

by Andrew Morton

[permalink] [raw]
Subject: - jbd-fix-commit-code-to-properly-abort-journal.patch removed from -mm tree

The patch titled
jbd: fix commit code to properly abort journal
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

Subject: jbd: fix commit code to properly abort journal
From: Jan Kara <[email protected]>

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 <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/jbd/commit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN fs/jbd/commit.c~jbd-fix-commit-code-to-properly-abort-journal fs/jbd/commit.c
--- a/fs/jbd/commit.c~jbd-fix-commit-code-to-properly-abort-journal
+++ a/fs/jbd/commit.c
@@ -466,7 +466,7 @@ void journal_commit_transaction(journal_

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_

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

@@ -557,7 +557,7 @@ void journal_commit_transaction(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);

@@ -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

Patches currently in -mm which might be from [email protected] are