On Tue, Mar 24, 2020 at 06:44:59PM +0100, Christoph Hellwig wrote: > From: Dave Chinner <dchinner@xxxxxxxxxx> > > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> Looks good, Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --D > --- > fs/xfs/xfs_log.c | 59 +++++++++++------------------------------------- > 1 file changed, 13 insertions(+), 46 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index 1d6ed696f717..521fe77e3aaa 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -463,14 +463,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 > @@ -1910,7 +1902,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. > @@ -2454,14 +2446,6 @@ xlog_write( > return error; > } > > - > -/***************************************************************************** > - * > - * State Machine functions > - * > - ***************************************************************************** > - */ > - > static void > xlog_state_activate_iclog( > struct xlog_in_core *iclog, > @@ -2822,7 +2806,7 @@ xlog_state_done_syncing( > */ > wake_up_all(&iclog->ic_write_wait); > spin_unlock(&log->l_icloglock); > - xlog_state_do_callback(log); /* also cleans log */ > + xlog_state_do_callback(log); > } > > /* > @@ -2942,13 +2926,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. > */ > void > xlog_ticket_regrant( > @@ -3030,12 +3015,8 @@ xlog_ticket_done( > } > > /* > - * Mark the current iclog in the ring as WANT_SYNC and move the current iclog > - * pointer to the next iclog in the ring. > - * > - * When called from xlog_state_get_iclog_space(), the exact size of the iclog > - * has not yet been determined, all we know is that we have run out of space in > - * the current iclog. > + * 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. > */ > STATIC void > xlog_state_switch_iclogs( > @@ -3080,7 +3061,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. > @@ -3287,13 +3268,6 @@ xfs_log_force_lsn( > return ret; > } > > -/***************************************************************************** > - * > - * TICKET functions > - * > - ***************************************************************************** > - */ > - > /* > * Free a used ticket when its refcount falls to zero. > */ > @@ -3450,13 +3424,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 > @@ -3542,7 +3509,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. > @@ -3645,7 +3612,7 @@ xlog_verify_iclog( > } > ptr += sizeof(xlog_op_header_t) + op_len; > } > -} /* xlog_verify_iclog */ > +} > #endif > > /* > -- > 2.25.1 >
