jbd2: remove redundant buffer io error checks

Now that __jbd2_journal_remove_checkpoint() can detect buffer io error
and mark journal checkpoint error, then we abort the journal later
before updating log tail to ensure the filesystem works consistently.
So we could remove other redundant buffer io error checkes.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210610112440.3438139-5-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index d27c10f4502f6ffa21cb13305d88ddb63316496d..75a4f622afaf05e9e74df301d62f3627d3a8d1de 100644 (file)
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -91,8 +91,7 @@ static int __try_to_free_cp_buf(struct journal_head *jh)
        int ret = 0;
        struct buffer_head *bh = jh2bh(jh);
 
-       if (jh->b_transaction == NULL && !buffer_locked(bh) &&
-           !buffer_dirty(bh) && !buffer_write_io_error(bh)) {
+       if (!jh->b_transaction && !buffer_locked(bh) && !buffer_dirty(bh)) {
                JBUFFER_TRACE(jh, "remove from checkpoint list");
                ret = __jbd2_journal_remove_checkpoint(jh) + 1;
        }
@@ -228,7 +227,6 @@ int jbd2_log_do_checkpoint(journal_t *journal)
         * OK, we need to start writing disk blocks.  Take one transaction
         * and write it.
         */
-       result = 0;
        spin_lock(&journal->j_list_lock);
        if (!journal->j_checkpoint_transactions)
                goto out;
@@ -295,8 +293,6 @@ restart:
                        goto restart;
                }
                if (!buffer_dirty(bh)) {
-                       if (unlikely(buffer_write_io_error(bh)) && !result)
-                               result = -EIO;
                        BUFFER_TRACE(bh, "remove from checkpoint");
                        if (__jbd2_journal_remove_checkpoint(jh))
                                /* The transaction was released; we're done */
@@ -356,8 +352,6 @@ restart2:
                        spin_lock(&journal->j_list_lock);
                        goto restart2;
                }
-               if (unlikely(buffer_write_io_error(bh)) && !result)
-                       result = -EIO;
 
                /*
                 * Now in whatever state the buffer currently is, we
@@ -369,10 +363,7 @@ restart2:
        }
 out:
        spin_unlock(&journal->j_list_lock);
-       if (result < 0)
-               jbd2_journal_abort(journal, result);
-       else
-               result = jbd2_cleanup_journal_tail(journal);
+       result = jbd2_cleanup_journal_tail(journal);
 
        return (result < 0) ? result : 0;
 }