On Fri, Mar 06, 2020 at 07:31:34AM -0700, Christoph Hellwig wrote: > We can just check for a shut down log all the way down in > xlog_cil_committed instead of passing the parameter. This means a > slight behavior change in that we now also abort log items if the > shutdown came in halfway into the I/O completion processing, which > actually is the right thing to do. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > fs/xfs/xfs_log.c | 48 +++++++++++++++----------------------------- > fs/xfs/xfs_log.h | 2 +- > fs/xfs/xfs_log_cil.c | 11 +++++----- > 3 files changed, 22 insertions(+), 39 deletions(-) > ... > diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c > index 48435cf2aa16..b5c4a45c208c 100644 > --- a/fs/xfs/xfs_log_cil.c > +++ b/fs/xfs/xfs_log_cil.c ... > @@ -878,7 +877,7 @@ xlog_cil_push( > out_abort_free_ticket: > xfs_log_ticket_put(tic); > out_abort: > - xlog_cil_committed(ctx, true); > + xlog_cil_committed(ctx); Error paths like this might warrant an assert. It's not really clear that we expect to be shutdown based on the context. Otherwise looks Ok. Brian > return -EIO; > } > > -- > 2.24.1 >
