From: Nikita Danilov <NikitaDanilov@Yahoo.COM>
To: Linus Torvalds <Torvalds@Transmeta.COM>
Cc: Reiserfs developers mail-list <Reiserfs-Dev@Namesys.COM>,
linux-kernel@vger.kernel.org
Subject: [PATCH]: reiserfs: B-journal-replay.patch
Date: Thu, 2 Aug 2001 19:33:20 +0400 [thread overview]
Message-ID: <15209.29376.729845.265611@beta.namesys.com> (raw)
Hello, Linus,
following patch by Chris Mason allows reiserfs to fail gracefully when
io error is hit during journal replay: just return error in stead of
panicking. Please, apply.
[lkml: please CC me, I am not subscribed.]
Nikita.
diff -rup linux-2.4.8-pre3/fs/reiserfs/journal.c linux-2.4.8-pre3.patched/fs/reiserfs/journal.c
--- linux-2.4.8-pre3/fs/reiserfs/journal.c Wed Aug 1 17:21:10 2001
+++ linux-2.4.8-pre3.patched/fs/reiserfs/journal.c Wed Aug 1 21:13:11 2001
@@ -815,7 +815,7 @@ static void remove_all_from_journal_list
** called by flush_journal_list, before it calls remove_all_from_journal_list
**
*/
-static int update_journal_header_block(struct super_block *p_s_sb, unsigned long offset, unsigned long trans_id) {
+static int _update_journal_header_block(struct super_block *p_s_sb, unsigned long offset, unsigned long trans_id) {
struct reiserfs_journal_header *jh ;
if (trans_id >= SB_JOURNAL(p_s_sb)->j_last_flush_trans_id) {
if (buffer_locked((SB_JOURNAL(p_s_sb)->j_header_bh))) {
@@ -834,12 +834,21 @@ static int update_journal_header_block(s
ll_rw_block(WRITE, 1, &(SB_JOURNAL(p_s_sb)->j_header_bh)) ;
wait_on_buffer((SB_JOURNAL(p_s_sb)->j_header_bh)) ;
if (!buffer_uptodate(SB_JOURNAL(p_s_sb)->j_header_bh)) {
- reiserfs_panic(p_s_sb, "journal-712: buffer write failed\n") ;
+ printk( "reiserfs: journal-837: IO error during journal replay\n" );
+ return -EIO ;
}
}
return 0 ;
}
+static int update_journal_header_block(struct super_block *p_s_sb,
+ unsigned long offset,
+ unsigned long trans_id) {
+ if (_update_journal_header_block(p_s_sb, offset, trans_id)) {
+ reiserfs_panic(p_s_sb, "journal-712: buffer write failed\n") ;
+ }
+ return 0 ;
+}
/*
** flush any and all journal lists older than you are
** can only be called from flush_journal_list
@@ -1374,6 +1383,9 @@ static int journal_transaction_is_valid(
struct buffer_head *c_bh ;
unsigned long offset ;
+ if (!d_bh)
+ return 0 ;
+
desc = (struct reiserfs_journal_desc *)d_bh->b_data ;
if (le32_to_cpu(desc->j_len) > 0 && !memcmp(desc->j_magic, JOURNAL_DESC_MAGIC, 8)) {
if (oldest_invalid_trans_id && *oldest_invalid_trans_id && le32_to_cpu(desc->j_trans_id) > *oldest_invalid_trans_id) {
@@ -1641,8 +1653,6 @@ static int journal_read(struct super_blo
if (continue_replay && is_read_only(p_s_sb->s_dev)) {
printk("clm-2076: device is readonly, unable to replay log\n") ;
- brelse(SB_JOURNAL(p_s_sb)->j_header_bh) ;
- SB_JOURNAL(p_s_sb)->j_header_bh = NULL ;
return -1 ;
}
if (continue_replay && (p_s_sb->s_flags & MS_RDONLY)) {
@@ -1734,9 +1744,14 @@ static int journal_read(struct super_blo
printk("reiserfs: replayed %d transactions in %lu seconds\n", replay_count,
CURRENT_TIME - start) ;
}
- if (!is_read_only(p_s_sb->s_dev)) {
- update_journal_header_block(p_s_sb, SB_JOURNAL(p_s_sb)->j_start,
- SB_JOURNAL(p_s_sb)->j_last_flush_trans_id) ;
+ if (!is_read_only(p_s_sb->s_dev) &&
+ _update_journal_header_block(p_s_sb, SB_JOURNAL(p_s_sb)->j_start,
+ SB_JOURNAL(p_s_sb)->j_last_flush_trans_id))
+ {
+ /* replay failed, caller must call free_journal_ram and abort
+ ** the mount
+ */
+ return -1 ;
}
return 0 ;
}
next reply other threads:[~2001-08-02 15:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-08-02 15:33 Nikita Danilov [this message]
2001-08-30 14:24 [PATCH]: reiserfs: B-journal-replay.patch Nikita Danilov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15209.29376.729845.265611@beta.namesys.com \
--to=nikitadanilov@yahoo.com \
--cc=Reiserfs-Dev@Namesys.COM \
--cc=Torvalds@Transmeta.COM \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).