xfs: up(ic_sema) if flushing data device fails

[platform/kernel/linux-starfive.git] / fs / xfs / xfs_log.c

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 51c100c..ee206fa 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1893,9 +1893,7 @@ xlog_write_iclog(
                 * the buffer manually, the code needs to be kept in sync
                 * with the I/O completion path.
                 */
-               xlog_state_done_syncing(iclog);
-               up(&iclog->ic_sema);
-               return;
+               goto sync;
        }
 
        /*
@@ -1925,20 +1923,17 @@ xlog_write_iclog(
                 * avoid shutdown re-entering this path and erroring out again.
                 */
                if (log->l_targ != log->l_mp->m_ddev_targp &&
-                   blkdev_issue_flush(log->l_mp->m_ddev_targp->bt_bdev)) {
-                       xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
-                       return;
-               }
+                   blkdev_issue_flush(log->l_mp->m_ddev_targp->bt_bdev))
+                       goto shutdown;
        }
        if (iclog->ic_flags & XLOG_ICL_NEED_FUA)
                iclog->ic_bio.bi_opf |= REQ_FUA;
 
        iclog->ic_flags &= ~(XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA);
 
-       if (xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count)) {
-               xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
-               return;
-       }
+       if (xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count))
+               goto shutdown;
+
        if (is_vmalloc_addr(iclog->ic_data))
                flush_kernel_vmap_range(iclog->ic_data, count);
 
@@ -1959,6 +1954,12 @@ xlog_write_iclog(
        }
 
        submit_bio(&iclog->ic_bio);
+       return;
+shutdown:
+       xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
+sync:
+       xlog_state_done_syncing(iclog);
+       up(&iclog->ic_sema);
 }
 
 /*