Message ID | 20210305051143.182133-31-david@fromorbit.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | xfs: consolidated log and optimisation changes | expand |
On Fri, Mar 05, 2021 at 04:11:28PM +1100, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > The rework of xlog_write() no longer requires xlog_get_iclog_state() > to tell it about internal iclog space reservation state to direct it > on what to do. Remove this parameter. > > $ size fs/xfs/xfs_log.o.* > text data bss dec hex filename > 26520 560 8 27088 69d0 fs/xfs/xfs_log.o.orig > 26384 560 8 26952 6948 fs/xfs/xfs_log.o.patched > > Signed-off-by: Dave Chinner <dchinner@redhat.com> This seems pretty straightforward, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_log.c | 33 +++++++++++---------------------- > 1 file changed, 11 insertions(+), 22 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index 10916b99bf0f..8f4f7ae84358 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -47,7 +47,6 @@ xlog_state_get_iclog_space( > int len, > struct xlog_in_core **iclog, > struct xlog_ticket *ticket, > - int *continued_write, > int *logoffsetp); > STATIC void > xlog_grant_push_ail( > @@ -2167,8 +2166,7 @@ xlog_write_get_more_iclog_space( > uint32_t *log_offset, > uint32_t len, > uint32_t *record_cnt, > - uint32_t *data_cnt, > - int *contwr) > + uint32_t *data_cnt) > { > struct xlog_in_core *iclog = *iclogp; > int error; > @@ -2182,8 +2180,8 @@ xlog_write_get_more_iclog_space( > if (error) > return error; > > - error = xlog_state_get_iclog_space(log, len, &iclog, > - ticket, contwr, log_offset); > + error = xlog_state_get_iclog_space(log, len, &iclog, ticket, > + log_offset); > if (error) > return error; > *record_cnt = 0; > @@ -2207,8 +2205,7 @@ xlog_write_partial( > uint32_t *log_offset, > uint32_t *len, > uint32_t *record_cnt, > - uint32_t *data_cnt, > - int *contwr) > + uint32_t *data_cnt) > { > struct xlog_in_core *iclog = *iclogp; > struct xfs_log_vec *lv = log_vector; > @@ -2242,7 +2239,7 @@ xlog_write_partial( > sizeof(struct xlog_op_header)) { > error = xlog_write_get_more_iclog_space(log, ticket, > &iclog, log_offset, *len, record_cnt, > - data_cnt, contwr); > + data_cnt); > if (error) > return ERR_PTR(error); > ptr = iclog->ic_datap + *log_offset; > @@ -2298,7 +2295,7 @@ xlog_write_partial( > } > error = xlog_write_get_more_iclog_space(log, ticket, > &iclog, log_offset, *len, record_cnt, > - data_cnt, contwr); > + data_cnt); > if (error) > return ERR_PTR(error); > ptr = iclog->ic_datap + *log_offset; > @@ -2396,7 +2393,6 @@ xlog_write( > { > struct xlog_in_core *iclog = NULL; > struct xfs_log_vec *lv = log_vector; > - int contwr = 0; > int record_cnt = 0; > int data_cnt = 0; > int error = 0; > @@ -2410,7 +2406,7 @@ xlog_write( > } > > error = xlog_state_get_iclog_space(log, len, &iclog, ticket, > - &contwr, &log_offset); > + &log_offset); > if (error) > return error; > > @@ -2425,10 +2421,8 @@ xlog_write( > * is correctly maintained in the storage media. This will always > * fit in the iclog we have been already been passed. > */ > - if (optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS)) { > + if (optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS)) > iclog->ic_flags |= (XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA); > - ASSERT(!contwr); > - } > > while (lv) { > lv = xlog_write_single(lv, ticket, iclog, &log_offset, > @@ -2438,7 +2432,7 @@ xlog_write( > > ASSERT(!(optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS))); > lv = xlog_write_partial(log, lv, ticket, &iclog, &log_offset, > - &len, &record_cnt, &data_cnt, &contwr); > + &len, &record_cnt, &data_cnt); > if (IS_ERR_OR_NULL(lv)) { > error = PTR_ERR_OR_ZERO(lv); > break; > @@ -2452,7 +2446,6 @@ xlog_write( > * those writes accounted to it. Hence we do not need to update the > * iclog with the number of bytes written here. > */ > - ASSERT(!contwr || XLOG_FORCED_SHUTDOWN(log)); > spin_lock(&log->l_icloglock); > xlog_state_finish_copy(log, iclog, record_cnt, 0); > if (commit_iclog) { > @@ -2856,7 +2849,6 @@ xlog_state_get_iclog_space( > int len, > struct xlog_in_core **iclogp, > struct xlog_ticket *ticket, > - int *continued_write, > int *logoffsetp) > { > int log_offset; > @@ -2932,13 +2924,10 @@ xlog_state_get_iclog_space( > * iclogs (to mark it taken), this particular iclog will release/sync > * to disk in xlog_write(). > */ > - if (len <= iclog->ic_size - iclog->ic_offset) { > - *continued_write = 0; > + if (len <= iclog->ic_size - iclog->ic_offset) > iclog->ic_offset += len; > - } else { > - *continued_write = 1; > + else > xlog_state_switch_iclogs(log, iclog, iclog->ic_size); > - } > *iclogp = iclog; > > ASSERT(iclog->ic_offset <= iclog->ic_size); > -- > 2.28.0 >
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 10916b99bf0f..8f4f7ae84358 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -47,7 +47,6 @@ xlog_state_get_iclog_space( int len, struct xlog_in_core **iclog, struct xlog_ticket *ticket, - int *continued_write, int *logoffsetp); STATIC void xlog_grant_push_ail( @@ -2167,8 +2166,7 @@ xlog_write_get_more_iclog_space( uint32_t *log_offset, uint32_t len, uint32_t *record_cnt, - uint32_t *data_cnt, - int *contwr) + uint32_t *data_cnt) { struct xlog_in_core *iclog = *iclogp; int error; @@ -2182,8 +2180,8 @@ xlog_write_get_more_iclog_space( if (error) return error; - error = xlog_state_get_iclog_space(log, len, &iclog, - ticket, contwr, log_offset); + error = xlog_state_get_iclog_space(log, len, &iclog, ticket, + log_offset); if (error) return error; *record_cnt = 0; @@ -2207,8 +2205,7 @@ xlog_write_partial( uint32_t *log_offset, uint32_t *len, uint32_t *record_cnt, - uint32_t *data_cnt, - int *contwr) + uint32_t *data_cnt) { struct xlog_in_core *iclog = *iclogp; struct xfs_log_vec *lv = log_vector; @@ -2242,7 +2239,7 @@ xlog_write_partial( sizeof(struct xlog_op_header)) { error = xlog_write_get_more_iclog_space(log, ticket, &iclog, log_offset, *len, record_cnt, - data_cnt, contwr); + data_cnt); if (error) return ERR_PTR(error); ptr = iclog->ic_datap + *log_offset; @@ -2298,7 +2295,7 @@ xlog_write_partial( } error = xlog_write_get_more_iclog_space(log, ticket, &iclog, log_offset, *len, record_cnt, - data_cnt, contwr); + data_cnt); if (error) return ERR_PTR(error); ptr = iclog->ic_datap + *log_offset; @@ -2396,7 +2393,6 @@ xlog_write( { struct xlog_in_core *iclog = NULL; struct xfs_log_vec *lv = log_vector; - int contwr = 0; int record_cnt = 0; int data_cnt = 0; int error = 0; @@ -2410,7 +2406,7 @@ xlog_write( } error = xlog_state_get_iclog_space(log, len, &iclog, ticket, - &contwr, &log_offset); + &log_offset); if (error) return error; @@ -2425,10 +2421,8 @@ xlog_write( * is correctly maintained in the storage media. This will always * fit in the iclog we have been already been passed. */ - if (optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS)) { + if (optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS)) iclog->ic_flags |= (XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA); - ASSERT(!contwr); - } while (lv) { lv = xlog_write_single(lv, ticket, iclog, &log_offset, @@ -2438,7 +2432,7 @@ xlog_write( ASSERT(!(optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS))); lv = xlog_write_partial(log, lv, ticket, &iclog, &log_offset, - &len, &record_cnt, &data_cnt, &contwr); + &len, &record_cnt, &data_cnt); if (IS_ERR_OR_NULL(lv)) { error = PTR_ERR_OR_ZERO(lv); break; @@ -2452,7 +2446,6 @@ xlog_write( * those writes accounted to it. Hence we do not need to update the * iclog with the number of bytes written here. */ - ASSERT(!contwr || XLOG_FORCED_SHUTDOWN(log)); spin_lock(&log->l_icloglock); xlog_state_finish_copy(log, iclog, record_cnt, 0); if (commit_iclog) { @@ -2856,7 +2849,6 @@ xlog_state_get_iclog_space( int len, struct xlog_in_core **iclogp, struct xlog_ticket *ticket, - int *continued_write, int *logoffsetp) { int log_offset; @@ -2932,13 +2924,10 @@ xlog_state_get_iclog_space( * iclogs (to mark it taken), this particular iclog will release/sync * to disk in xlog_write(). */ - if (len <= iclog->ic_size - iclog->ic_offset) { - *continued_write = 0; + if (len <= iclog->ic_size - iclog->ic_offset) iclog->ic_offset += len; - } else { - *continued_write = 1; + else xlog_state_switch_iclogs(log, iclog, iclog->ic_size); - } *iclogp = iclog; ASSERT(iclog->ic_offset <= iclog->ic_size);