Re: [PATCH 10/11] xfs: remove some stale comments from the log code

Brian Foster
2020-03-05T18:08:24Z

On Wed, Mar 04, 2020 at 06:54:00PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

> fs/xfs/xfs_log.c | 71 ++++++++++++++----------------------------------
> 1 file changed, 20 insertions(+), 51 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index a687c20dd77d..89956484848f 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -477,14 +477,6 @@ xfs_log_reserve(
> return error;
> }
>
> -
> -/*
> - * NOTES:
> - *
> - * 1. currblock field gets updated at startup and after in-core logs
> - * marked as with WANT_SYNC.
> - */
> -
> /*
> * Write out an unmount record using the ticket provided. We have to account for
> * the data space used in the unmount ticket as this write is not done from a
> @@ -1968,7 +1960,7 @@ xlog_dealloc_log(
> log->l_mp->m_log = NULL;
> destroy_workqueue(log->l_ioend_workqueue);
> kmem_free(log);
> -} /* xlog_dealloc_log */
> +}
>
> /*
> * Update counters atomically now that memcpy is done.
> @@ -2511,14 +2503,6 @@ xlog_write(
> return error;
> }
>
> -
> -/*****************************************************************************
> - *
> - * State Machine functions
> - *
> - *****************************************************************************
> - */
> -
> /*
> * An iclog has just finished IO completion processing, so we need to update
> * the iclog state and propagate that up into the overall log state. Hence we
> @@ -2887,8 +2871,8 @@ xlog_state_done_syncing(
> */
> wake_up_all(&iclog->ic_write_wait);
> spin_unlock(&log->l_icloglock);
> - xlog_state_do_callback(log, aborted); /* also cleans log */
> -} /* xlog_state_done_syncing */
> + xlog_state_do_callback(log, aborted);
> +}
>
>
> /*
> @@ -3008,14 +2992,14 @@ xlog_state_get_iclog_space(
>
> *logoffsetp = log_offset;
> return 0;
> -} /* xlog_state_get_iclog_space */
> -
> -/* The first cnt-1 times through here we don't need to
> - * move the grant write head because the permanent
> - * reservation has reserved cnt times the unit amount.
> - * Release part of current permanent unit reservation and
> - * reset current reservation to be one units worth. Also
> - * move grant reservation head forward.
> +}
> +
> +/*
> + * The first cnt-1 times a ticket goes through here we don't need to move the
> + * grant write head because the permanent reservation has reserved cnt times the
> + * unit amount. Release part of current permanent unit reservation and reset
> + * current reservation to be one units worth. Also move grant reservation head
> + * forward.
> */
> STATIC void
> xlog_regrant_reserve_log_space(
> @@ -3047,7 +3031,7 @@ xlog_regrant_reserve_log_space(
>
> ticket->t_curr_res = ticket->t_unit_res;
> xlog_tic_reset_res(ticket);
> -} /* xlog_regrant_reserve_log_space */
> +}
>
>
> /*
> @@ -3096,11 +3080,11 @@ xlog_ungrant_log_space(
> }
>
> /*
> - * This routine will mark the current iclog in the ring as WANT_SYNC
> - * and move the current iclog pointer to the next iclog in the ring.
> - * When this routine is called from xlog_state_get_iclog_space(), the
> - * exact size of the iclog has not yet been determined. All we know is
> - * that every data block. We have run out of space in this log record.
> + * This routine will mark the current iclog in the ring as WANT_SYNC and move
> + * the current iclog pointer to the next iclog in the ring. When this routine
> + * is called from xlog_state_get_iclog_space(), the exact size of the iclog has
> + * not yet been determined. All we know is that every data block. We have run
> + * out of space in this log record.
> */
> STATIC void
> xlog_state_switch_iclogs(
> @@ -3143,7 +3127,7 @@ xlog_state_switch_iclogs(
> }
> ASSERT(iclog == log->l_iclog);
> log->l_iclog = iclog->ic_next;
> -} /* xlog_state_switch_iclogs */
> +}
>
> /*
> * Write out all data in the in-core log as of this exact moment in time.
> @@ -3397,14 +3381,6 @@ xlog_state_want_sync(
> }
> }
>
> -
> -/*****************************************************************************
> - *
> - * TICKET functions
> - *
> - *****************************************************************************
> - */
> -
> /*
> * Free a used ticket when its refcount falls to zero.
> */
> @@ -3562,13 +3538,6 @@ xlog_ticket_alloc(
> return tic;
> }
>
> -
> -/******************************************************************************
> - *
> - * Log debug routines
> - *
> - ******************************************************************************
> - */
> #if defined(DEBUG)
> /*
> * Make sure that the destination ptr is within the valid data region of
> @@ -3654,7 +3623,7 @@ xlog_verify_tail_lsn(
> if (blocks < BTOBB(iclog->ic_offset) + 1)
> xfs_emerg(log->l_mp, "%s: ran out of log space", __func__);
> }
> -} /* xlog_verify_tail_lsn */
> +}
>
> /*
> * Perform a number of checks on the iclog before writing to disk.
> @@ -3757,7 +3726,7 @@ xlog_verify_iclog(
> }
> ptr += sizeof(xlog_op_header_t) + op_len;
> }
> -} /* xlog_verify_iclog */
> +}
> #endif
>
> /*
> --
> 2.24.0.rc0
>