diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-08-07 13:26:24 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-08-09 08:16:56 +0200 |
| commit | 8887b94d93224e0ef7e1bc6369640e313b8b12f4 (patch) | |
| tree | d6b142113daf71d64db05c1d2b418eaa531ed9a6 /fs/ocfs2/journal.c | |
| parent | ext4: don't use bdev->bd_super in __ext4_journal_get_write_access (diff) | |
| download | linux-8887b94d93224e0ef7e1bc6369640e313b8b12f4.tar.xz linux-8887b94d93224e0ef7e1bc6369640e313b8b12f4.zip | |
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: Christoph Hellwig <hch@lst.de>
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Message-Id: <20230807112625.652089-4-hch@lst.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/ocfs2/journal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 25d8072ccfce..c19c730c26e2 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -557,7 +557,7 @@ static void ocfs2_abort_trigger(struct jbd2_buffer_trigger_type *triggers, (unsigned long)bh, (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"); } @@ -780,14 +780,14 @@ void ocfs2_journal_dirty(handle_t *handle, struct buffer_head *bh) mlog_errno(status); if (!is_handle_aborted(handle)) { 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. " "Aborting transaction and journal.\n"); handle->h_err = status; jbd2_journal_abort_handle(handle); 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"); } } } |