Home » Mailing list archives » linux-kernel » 2007 » October » 4

[PATCH] jbd2: fix commit code to properly abort journal

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Theodore Ts'o <tytso@...>
To: <linux-kernel@...>
Cc: <linux-ext4@...>, Jan Kara <jack@...>, Andrew Morton <akpm@...>
Subject: [PATCH] jbd2: fix commit code to properly abort journal
Date: Thursday, October 4, 2007 - 1:50 am

From: Jan Kara <jack@suse.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@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 fs/jbd2/commit.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index b898ee4..6986f33 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -475,7 +475,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 	spin_unlock(&journal->j_list_lock);
 
 	if (err)
-		__jbd2_journal_abort_hard(journal);
+		jbd2_journal_abort(journal, err);
 
 	jbd2_journal_write_revoke_records(journal, commit_transaction);
 
@@ -533,7 +533,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 
 			descriptor = jbd2_journal_get_descriptor_buffer(journal);
 			if (!descriptor) {
-				__jbd2_journal_abort_hard(journal);
+				jbd2_journal_abort(journal, -EIO);
 				continue;
 			}
 
@@ -566,7 +566,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 		   and repeat this loop: we'll fall into the
 		   refile-on-abort condition above. */
 		if (err) {
-			__jbd2_journal_abort_hard(journal);
+			jbd2_journal_abort(journal, err);
 			continue;
 		}
 
@@ -757,7 +757,7 @@ wait_for_iobuf:
 		err = -EIO;
 
 	if (err)
-		__jbd2_journal_abort_hard(journal);
+		jbd2_journal_abort(journal, err);
 
 	/* End of a transaction!  Finally, we can do checkpoint
            processing: any buffers committed as a result of this
-- 
1.5.3.2.81.g17ed

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] jbd2: fix commit code to properly abort journal, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] JBD2: debug code cleanup., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] Once ext4 will not implement fragment, it is believe..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] ext4: remove #ifdef CONFIG_EXT4_INDEX, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] Ext4: Uninitialized Block Groups, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] ext4: Fix sparse warnings, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] This feature relaxes check restrictions on where eac..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] Support large blocksize up to PAGESIZE (max 64KB) fo..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] ext4: Avoid rec_len overflow with 64KB block size, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] Support large blocksize up to PAGESIZE (max 64KB) fo..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] Support large blocksize up to PAGESIZE (max 64KB) fo..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] ext2: Avoid rec_len overflow with 64KB block size, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] ext3: Avoid rec_len overflow with 64KB block size, Theodore Ts'o, (Thu Oct 4, 1:50 am)