| Message ID | 20200304075401.21558-9-david@fromorbit.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xfs: clean up log tickets and record writes | expand |
On Wed, Mar 04, 2020 at 06:53:58PM +1100, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > The naming and calling conventions are a bit of a mess. Clean it up > so the call chain looks like: > > xfs_log_unmount_write(mp) > xlog_unmount_write(log) > xlog_write_unmount_record(log, ticket) > > Signed-off-by: Dave Chinner <dchinner@redhat.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
On Wed, Mar 04, 2020 at 06:53:58PM +1100, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > The naming and calling conventions are a bit of a mess. Clean it up > so the call chain looks like: > > xfs_log_unmount_write(mp) > xlog_unmount_write(log) > xlog_write_unmount_record(log, ticket) > > Signed-off-by: Dave Chinner <dchinner@redhat.com> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/xfs_log.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index a310ca9e7615..bdf604d31d8c 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -491,7 +491,7 @@ xfs_log_reserve( > * transaction context that has already done the accounting for us. > */ > static int > -xlog_write_unmount( > +xlog_write_unmount_record( > struct xlog *log, > struct xlog_ticket *ticket, > xfs_lsn_t *lsn, > @@ -903,10 +903,10 @@ xlog_state_ioerror( > * log. > */ > static void > -xfs_log_write_unmount_record( > - struct xfs_mount *mp) > +xlog_unmount_write( > + struct xlog *log) > { > - struct xlog *log = mp->m_log; > + struct xfs_mount *mp = log->l_mp; > struct xlog_in_core *iclog; > struct xlog_ticket *tic = NULL; > xfs_lsn_t lsn; > @@ -930,7 +930,7 @@ xfs_log_write_unmount_record( > flags &= ~XLOG_UNMOUNT_TRANS; > } > > - error = xlog_write_unmount(log, tic, &lsn, flags); > + error = xlog_write_unmount_record(log, tic, &lsn, flags); > /* > * At this point, we're umounting anyway, so there's no point in > * transitioning log state to IOERROR. Just continue... > @@ -1006,7 +1006,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) > } while (iclog != first_iclog); > #endif > if (! (XLOG_FORCED_SHUTDOWN(log))) { > - xfs_log_write_unmount_record(mp); > + xlog_unmount_write(log); > } else { > /* > * We're already in forced_shutdown mode, couldn't > -- > 2.24.0.rc0 >
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index a310ca9e7615..bdf604d31d8c 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -491,7 +491,7 @@ xfs_log_reserve( * transaction context that has already done the accounting for us. */ static int -xlog_write_unmount( +xlog_write_unmount_record( struct xlog *log, struct xlog_ticket *ticket, xfs_lsn_t *lsn, @@ -903,10 +903,10 @@ xlog_state_ioerror( * log. */ static void -xfs_log_write_unmount_record( - struct xfs_mount *mp) +xlog_unmount_write( + struct xlog *log) { - struct xlog *log = mp->m_log; + struct xfs_mount *mp = log->l_mp; struct xlog_in_core *iclog; struct xlog_ticket *tic = NULL; xfs_lsn_t lsn; @@ -930,7 +930,7 @@ xfs_log_write_unmount_record( flags &= ~XLOG_UNMOUNT_TRANS; } - error = xlog_write_unmount(log, tic, &lsn, flags); + error = xlog_write_unmount_record(log, tic, &lsn, flags); /* * At this point, we're umounting anyway, so there's no point in * transitioning log state to IOERROR. Just continue... @@ -1006,7 +1006,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) } while (iclog != first_iclog); #endif if (! (XLOG_FORCED_SHUTDOWN(log))) { - xfs_log_write_unmount_record(mp); + xlog_unmount_write(log); } else { /* * We're already in forced_shutdown mode, couldn't