From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com,
Dave Chinner <dchinner@redhat.com>,
Brian Foster <bfoster@redhat.com>
Subject: Re: [PATCH 4/8] xfs: kill XLOG_TIC_INITED
Date: Tue, 24 Mar 2020 13:40:11 -0700 [thread overview]
Message-ID: <20200324204011.GK29339@magnolia> (raw)
In-Reply-To: <20200324174459.770999-5-hch@lst.de>
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
>
next prev parent reply other threads:[~2020-03-24 20:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 17:44 xfs: clean up log tickets and record writes v3 Christoph Hellwig
2020-03-24 17:44 ` [PATCH 1/8] xfs: don't try to write a start record into every iclog Christoph Hellwig
2020-03-24 20:39 ` Darrick J. Wong
2020-03-25 12:33 ` Brian Foster
2020-03-25 23:25 ` Dave Chinner
2020-03-26 11:08 ` Brian Foster
2020-03-26 15:41 ` Darrick J. Wong
2020-03-24 17:44 ` [PATCH 2/8] xfs: re-order initial space accounting checks in xlog_write Christoph Hellwig
2020-03-24 20:39 ` Darrick J. Wong
2020-03-24 17:44 ` [PATCH 3/8] xfs: refactor and split xfs_log_done() Christoph Hellwig
2020-03-24 20:39 ` Darrick J. Wong
2020-03-25 12:33 ` Brian Foster
2020-03-24 17:44 ` [PATCH 4/8] xfs: kill XLOG_TIC_INITED Christoph Hellwig
2020-03-24 20:40 ` Darrick J. Wong [this message]
2020-03-24 17:44 ` [PATCH 5/8] xfs: split xlog_ticket_done Christoph Hellwig
2020-03-24 20:41 ` Darrick J. Wong
2020-03-25 12:34 ` Brian Foster
2020-03-24 17:44 ` [PATCH 6/8] xfs: merge xlog_commit_record with xlog_write_done() Christoph Hellwig
2020-03-24 20:41 ` Darrick J. Wong
2020-03-24 17:44 ` [PATCH 7/8] xfs: refactor unmount record writing Christoph Hellwig
2020-03-24 20:41 ` Darrick J. Wong
2020-03-24 17:44 ` [PATCH 8/8] xfs: remove some stale comments from the log code Christoph Hellwig
2020-03-24 20:42 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-03-25 18:42 xfs: clean up log tickets and record writes v4 Christoph Hellwig
2020-03-25 18:43 ` [PATCH 4/8] xfs: kill XLOG_TIC_INITED Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200324204011.GK29339@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=dchinner@redhat.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox