| Message ID | 20200324174459.770999-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| 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:55PM +0100, Christoph Hellwig wrote: > From: Dave Chinner <dchinner@redhat.com> > > It is not longer used or checked by anything, so remove the last > traces from the log ticket code. > > 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 | 4 ---- > fs/xfs/xfs_log_priv.h | 6 ++---- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index 528ace7a6bb9..b30bb6452494 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -2346,9 +2346,6 @@ xlog_write( > * to account for an extra xlog_op_header here. > */ > ticket->t_curr_res -= sizeof(struct xlog_op_header); > - if (ticket->t_flags & XLOG_TIC_INITED) > - ticket->t_flags &= ~XLOG_TIC_INITED; > - > if (ticket->t_curr_res < 0) { > xfs_alert_tag(log->l_mp, XFS_PTAG_LOGRES, > "ctx ticket reservation ran out. Need to up reservation"); > @@ -3488,7 +3485,6 @@ xlog_ticket_alloc( > tic->t_ocnt = cnt; > tic->t_tid = prandom_u32(); > tic->t_clientid = client; > - tic->t_flags = XLOG_TIC_INITED; > if (permanent) > tic->t_flags |= XLOG_TIC_PERM_RESERV; > > diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h > index 32bb6856e69d..cfe5295ef4e3 100644 > --- a/fs/xfs/xfs_log_priv.h > +++ b/fs/xfs/xfs_log_priv.h > @@ -51,13 +51,11 @@ enum xlog_iclog_state { > }; > > /* > - * Flags to log ticket > + * Log ticket flags > */ > -#define XLOG_TIC_INITED 0x1 /* has been initialized */ > -#define XLOG_TIC_PERM_RESERV 0x2 /* permanent reservation */ > +#define XLOG_TIC_PERM_RESERV 0x1 /* permanent reservation */ > > #define XLOG_TIC_FLAGS \ > - { XLOG_TIC_INITED, "XLOG_TIC_INITED" }, \ > { XLOG_TIC_PERM_RESERV, "XLOG_TIC_PERM_RESERV" } > > /* > -- > 2.25.1 >
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 528ace7a6bb9..b30bb6452494 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -2346,9 +2346,6 @@ xlog_write( * to account for an extra xlog_op_header here. */ ticket->t_curr_res -= sizeof(struct xlog_op_header); - if (ticket->t_flags & XLOG_TIC_INITED) - ticket->t_flags &= ~XLOG_TIC_INITED; - if (ticket->t_curr_res < 0) { xfs_alert_tag(log->l_mp, XFS_PTAG_LOGRES, "ctx ticket reservation ran out. Need to up reservation"); @@ -3488,7 +3485,6 @@ xlog_ticket_alloc( tic->t_ocnt = cnt; tic->t_tid = prandom_u32(); tic->t_clientid = client; - tic->t_flags = XLOG_TIC_INITED; if (permanent) tic->t_flags |= XLOG_TIC_PERM_RESERV; diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 32bb6856e69d..cfe5295ef4e3 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h @@ -51,13 +51,11 @@ enum xlog_iclog_state { }; /* - * Flags to log ticket + * Log ticket flags */ -#define XLOG_TIC_INITED 0x1 /* has been initialized */ -#define XLOG_TIC_PERM_RESERV 0x2 /* permanent reservation */ +#define XLOG_TIC_PERM_RESERV 0x1 /* permanent reservation */ #define XLOG_TIC_FLAGS \ - { XLOG_TIC_INITED, "XLOG_TIC_INITED" }, \ { XLOG_TIC_PERM_RESERV, "XLOG_TIC_PERM_RESERV" } /*