From: Yu Kuai <yuku...@huawei.com>

Avoid to access bd_inode directly, prepare to remove bd_inode from
block_devcie.

Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
 fs/jbd2/journal.c  | 3 +--
 fs/jbd2/recovery.c | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index ed53188472f9..f1b5ffeaf02a 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2003,8 +2003,7 @@ static int __jbd2_journal_erase(journal_t *journal, 
unsigned int flags)
                byte_count = (block_stop - block_start + 1) *
                                journal->j_blocksize;
 
-               truncate_inode_pages_range(journal->j_dev->bd_inode->i_mapping,
-                               byte_start, byte_stop);
+               truncate_bdev_range(journal->j_dev, 0, byte_start, byte_stop);
 
                if (flags & JBD2_JOURNAL_FLUSH_DISCARD) {
                        err = blkdev_issue_discard(journal->j_dev,
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index 01f744cb97a4..6b6a2c4585fa 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -290,7 +290,6 @@ int jbd2_journal_recover(journal_t *journal)
 
        struct recovery_info    info;
        errseq_t                wb_err;
-       struct address_space    *mapping;
 
        memset(&info, 0, sizeof(info));
        sb = journal->j_superblock;
@@ -309,8 +308,7 @@ int jbd2_journal_recover(journal_t *journal)
        }
 
        wb_err = 0;
-       mapping = journal->j_fs_dev->bd_inode->i_mapping;
-       errseq_check_and_advance(&mapping->wb_err, &wb_err);
+       bdev_wb_err_check_and_advance(journal->j_fs_dev, &wb_err);
        err = do_one_pass(journal, &info, PASS_SCAN);
        if (!err)
                err = do_one_pass(journal, &info, PASS_REVOKE);
@@ -334,7 +332,7 @@ int jbd2_journal_recover(journal_t *journal)
        err2 = sync_blockdev(journal->j_fs_dev);
        if (!err)
                err = err2;
-       err2 = errseq_check_and_advance(&mapping->wb_err, &wb_err);
+       err2 = bdev_wb_err_check_and_advance(journal->j_fs_dev, &wb_err);
        if (!err)
                err = err2;
        /* Make sure all replayed data is on permanent storage */
-- 
2.39.2


Reply via email to