Commit 8887b94d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner

ocfs2: stop using bdev->bd_super for journal error logging

All ocfs2 journal error handling and logging is based on buffer_heads,
and the owning inode and thus super_block can be retrieved through
bh->b_assoc_map->host.  Switch to using that to remove the last users
of bdev->bd_super.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Message-Id: <20230807112625.652089-4-hch@lst.de>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 01efe93a
...@@ -557,7 +557,7 @@ static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers, ...@@ -557,7 +557,7 @@ static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers,
(unsigned long)bh, (unsigned long)bh,
(unsigned long long)bh->b_blocknr); (unsigned long long)bh->b_blocknr);
ocfs2_error(bh->b_bdev->bd_super, ocfs2_error(bh->b_assoc_map->host->i_sb,
"JBD2 has aborted our journal, ocfs2 cannot continue\n"); "JBD2 has aborted our journal, ocfs2 cannot continue\n");
} }
...@@ -780,14 +780,14 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh) ...@@ -780,14 +780,14 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh)
mlog_errno(status); mlog_errno(status);
if (!is_handle_aborted(handle)) { if (!is_handle_aborted(handle)) {
journal_t *journal = handle->h_transaction->t_journal; journal_t *journal = handle->h_transaction->t_journal;
struct super_block *sb = bh->b_bdev->bd_super;
mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. " mlog(ML_ERROR, "jbd2_journal_dirty_metadata failed. "
"Aborting transaction and journal.\n"); "Aborting transaction and journal.\n");
handle->h_err = status; handle->h_err = status;
jbd2_journal_abort_handle(handle); jbd2_journal_abort_handle(handle);
jbd2_journal_abort(journal, status); jbd2_journal_abort(journal, status);
ocfs2_abort(sb, "Journal already aborted.\n"); ocfs2_abort(bh->b_assoc_map->host->i_sb,
"Journal already aborted.\n");
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment