Message ID | 20200324174459.770999-7-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/8] xfs: don't try to write a start record into every iclog | expand |
On Tue, Mar 24, 2020 at 06:44:57PM +0100, Christoph Hellwig wrote: > From: Dave Chinner <dchinner@redhat.com> > > xlog_write_done() is just a thin wrapper around > xlog_commit_record(), so they can be merged together easily. Convert > all the xlog_commit_record() callers to use xlog_write_done() and > merge the implementations. > > Signed-off-by: Dave Chinner <dchinner@redhat.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Brian Foster <bfoster@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_log.c | 44 +++++++++++--------------------------------- > 1 file changed, 11 insertions(+), 33 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index 9a26ee8db238..a173b5925d1b 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -24,13 +24,6 @@ > kmem_zone_t *xfs_log_ticket_zone; > > /* Local miscellaneous function prototypes */ > -STATIC int > -xlog_commit_record( > - struct xlog *log, > - struct xlog_ticket *ticket, > - struct xlog_in_core **iclog, > - xfs_lsn_t *commitlsnp); > - > STATIC struct xlog * > xlog_alloc_log( > struct xfs_mount *mp, > @@ -478,22 +471,6 @@ xfs_log_reserve( > * marked as with WANT_SYNC. > */ > > -/* > - * Write a commit record to the log to close off a running log write. > - */ > -int > -xlog_write_done( > - struct xlog *log, > - struct xlog_ticket *ticket, > - struct xlog_in_core **iclog, > - xfs_lsn_t *lsn) > -{ > - if (XLOG_FORCED_SHUTDOWN(log)) > - return -EIO; > - > - return xlog_commit_record(log, ticket, iclog, lsn); > -} > - > static bool > __xlog_state_release_iclog( > struct xlog *log, > @@ -1463,20 +1440,17 @@ xlog_alloc_log( > return ERR_PTR(error); > } /* xlog_alloc_log */ > > - > /* > * Write out the commit record of a transaction associated with the given > - * ticket. Return the lsn of the commit record. > + * ticket to close off a running log write. Return the lsn of the commit record. > */ > -STATIC int > -xlog_commit_record( > +int > +xlog_write_done( > struct xlog *log, > struct xlog_ticket *ticket, > struct xlog_in_core **iclog, > - xfs_lsn_t *commitlsnp) > + xfs_lsn_t *lsn) > { > - struct xfs_mount *mp = log->l_mp; > - int error; > struct xfs_log_iovec reg = { > .i_addr = NULL, > .i_len = 0, > @@ -1486,12 +1460,16 @@ xlog_commit_record( > .lv_niovecs = 1, > .lv_iovecp = ®, > }; > + int error; > > ASSERT_ALWAYS(iclog); > - error = xlog_write(log, &vec, ticket, commitlsnp, iclog, > - XLOG_COMMIT_TRANS); > + > + if (XLOG_FORCED_SHUTDOWN(log)) > + return -EIO; > + > + error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS); > if (error) > - xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR); > + xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); > return error; > } > > -- > 2.25.1 >
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 9a26ee8db238..a173b5925d1b 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -24,13 +24,6 @@ kmem_zone_t *xfs_log_ticket_zone; /* Local miscellaneous function prototypes */ -STATIC int -xlog_commit_record( - struct xlog *log, - struct xlog_ticket *ticket, - struct xlog_in_core **iclog, - xfs_lsn_t *commitlsnp); - STATIC struct xlog * xlog_alloc_log( struct xfs_mount *mp, @@ -478,22 +471,6 @@ xfs_log_reserve( * marked as with WANT_SYNC. */ -/* - * Write a commit record to the log to close off a running log write. - */ -int -xlog_write_done( - struct xlog *log, - struct xlog_ticket *ticket, - struct xlog_in_core **iclog, - xfs_lsn_t *lsn) -{ - if (XLOG_FORCED_SHUTDOWN(log)) - return -EIO; - - return xlog_commit_record(log, ticket, iclog, lsn); -} - static bool __xlog_state_release_iclog( struct xlog *log, @@ -1463,20 +1440,17 @@ xlog_alloc_log( return ERR_PTR(error); } /* xlog_alloc_log */ - /* * Write out the commit record of a transaction associated with the given - * ticket. Return the lsn of the commit record. + * ticket to close off a running log write. Return the lsn of the commit record. */ -STATIC int -xlog_commit_record( +int +xlog_write_done( struct xlog *log, struct xlog_ticket *ticket, struct xlog_in_core **iclog, - xfs_lsn_t *commitlsnp) + xfs_lsn_t *lsn) { - struct xfs_mount *mp = log->l_mp; - int error; struct xfs_log_iovec reg = { .i_addr = NULL, .i_len = 0, @@ -1486,12 +1460,16 @@ xlog_commit_record( .lv_niovecs = 1, .lv_iovecp = ®, }; + int error; ASSERT_ALWAYS(iclog); - error = xlog_write(log, &vec, ticket, commitlsnp, iclog, - XLOG_COMMIT_TRANS); + + if (XLOG_FORCED_SHUTDOWN(log)) + return -EIO; + + error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS); if (error) - xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR); + xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); return error; }