hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC8HLD -------------------------------- This reverts commit 84be6cefea7b9cffc28ed4b6f59dccd131a167f8. Signed-off-by: Long Li <leo.lilong@huawei.com> --- fs/xfs/xfs_log.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 1fad7cf850a7..ac085fbdbc86 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -2706,22 +2706,19 @@ xlog_get_lowest_lsn( static void xlog_state_set_callback( struct xlog *log, - struct xlog_in_core *iclog) + struct xlog_in_core *iclog, + xfs_lsn_t header_lsn) { - struct xfs_cil_ctx *ctx; - trace_xlog_iclog_callback(iclog, _RET_IP_); iclog->ic_state = XLOG_STATE_CALLBACK; - ctx = list_first_entry_or_null(&iclog->ic_callbacks, - struct xfs_cil_ctx, iclog_entry); - if (!ctx) - return; - ASSERT(XFS_LSN_CMP(atomic64_read(&log->l_last_sync_lsn), - ctx->start_lsn) <= 0); + header_lsn) <= 0); + + if (list_empty_careful(&iclog->ic_callbacks)) + return; - atomic64_set(&log->l_last_sync_lsn, ctx->start_lsn); + atomic64_set(&log->l_last_sync_lsn, header_lsn); xlog_grant_push_ail(log, 0); } @@ -2756,7 +2753,7 @@ xlog_state_iodone_process_iclog( lowest_lsn = xlog_get_lowest_lsn(log); if (lowest_lsn && XFS_LSN_CMP(lowest_lsn, header_lsn) < 0) return false; - xlog_state_set_callback(log, iclog); + xlog_state_set_callback(log, iclog, header_lsn); return false; default: /* -- 2.39.2