[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200710190624.l9J6O4hc019261@imap1.linux-foundation.org>
Date: Thu, 18 Oct 2007 23:24:04 -0700
From: akpm@...ux-foundation.org
To: torvalds@...ux-foundation.org
Cc: akpm@...ux-foundation.org, jack@...e.cz, linux-ext4@...r.kernel.org
Subject: [patch 018/144] jbd: fix commit code to properly abort journal
From: Jan Kara <jack@...e.cz>
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@...e.cz>
Cc: <linux-ext4@...r.kernel.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
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_
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_
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_
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
_
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists