From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 01/11] xfs: remove the xfs_efi_log_item_t typedef
Date: Thu, 30 Apr 2020 07:02:53 -0400 [thread overview]
Message-ID: <20200430110253.GA5349@bfoster> (raw)
In-Reply-To: <20200429150511.2191150-2-hch@lst.de>
On Wed, Apr 29, 2020 at 05:05:01PM +0200, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_extfree_item.c | 2 +-
> fs/xfs/xfs_extfree_item.h | 10 +++++-----
> fs/xfs/xfs_log_recover.c | 4 ++--
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index 6ea847f6e2980..00309b81607cd 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -161,7 +161,7 @@ xfs_efi_init(
>
> ASSERT(nextents > 0);
> if (nextents > XFS_EFI_MAX_FAST_EXTENTS) {
> - size = (uint)(sizeof(xfs_efi_log_item_t) +
> + size = (uint)(sizeof(struct xfs_efi_log_item) +
> ((nextents - 1) * sizeof(xfs_extent_t)));
> efip = kmem_zalloc(size, 0);
> } else {
> diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
> index 16aaab06d4ecc..b9b567f355756 100644
> --- a/fs/xfs/xfs_extfree_item.h
> +++ b/fs/xfs/xfs_extfree_item.h
> @@ -50,13 +50,13 @@ struct kmem_zone;
> * of commit failure or log I/O errors. Note that the EFD is not inserted in the
> * AIL, so at this point both the EFI and EFD are freed.
> */
> -typedef struct xfs_efi_log_item {
> +struct xfs_efi_log_item {
> struct xfs_log_item efi_item;
> atomic_t efi_refcount;
> atomic_t efi_next_extent;
> unsigned long efi_flags; /* misc flags */
> xfs_efi_log_format_t efi_format;
> -} xfs_efi_log_item_t;
> +};
>
> /*
> * This is the "extent free done" log item. It is used to log
> @@ -65,7 +65,7 @@ typedef struct xfs_efi_log_item {
> */
> typedef struct xfs_efd_log_item {
> struct xfs_log_item efd_item;
> - xfs_efi_log_item_t *efd_efip;
> + struct xfs_efi_log_item *efd_efip;
> uint efd_next_extent;
> xfs_efd_log_format_t efd_format;
> } xfs_efd_log_item_t;
> @@ -78,10 +78,10 @@ typedef struct xfs_efd_log_item {
> extern struct kmem_zone *xfs_efi_zone;
> extern struct kmem_zone *xfs_efd_zone;
>
> -xfs_efi_log_item_t *xfs_efi_init(struct xfs_mount *, uint);
> +struct xfs_efi_log_item *xfs_efi_init(struct xfs_mount *, uint);
> int xfs_efi_copy_format(xfs_log_iovec_t *buf,
> xfs_efi_log_format_t *dst_efi_fmt);
> -void xfs_efi_item_free(xfs_efi_log_item_t *);
> +void xfs_efi_item_free(struct xfs_efi_log_item *);
> void xfs_efi_release(struct xfs_efi_log_item *);
>
> int xfs_efi_recover(struct xfs_mount *mp,
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 11c3502b07b13..c81f71e2888cf 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3365,7 +3365,7 @@ xlog_recover_efd_pass2(
> struct xlog_recover_item *item)
> {
> xfs_efd_log_format_t *efd_formatp;
> - xfs_efi_log_item_t *efip = NULL;
> + struct xfs_efi_log_item *efip = NULL;
> struct xfs_log_item *lip;
> uint64_t efi_id;
> struct xfs_ail_cursor cur;
> @@ -3386,7 +3386,7 @@ xlog_recover_efd_pass2(
> lip = xfs_trans_ail_cursor_first(ailp, &cur, 0);
> while (lip != NULL) {
> if (lip->li_type == XFS_LI_EFI) {
> - efip = (xfs_efi_log_item_t *)lip;
> + efip = (struct xfs_efi_log_item *)lip;
> if (efip->efi_format.efi_id == efi_id) {
> /*
> * Drop the EFD reference to the EFI. This
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-04-30 11:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 15:05 deferred operations cleanup Christoph Hellwig
2020-04-29 15:05 ` [PATCH 01/11] xfs: remove the xfs_efi_log_item_t typedef Christoph Hellwig
2020-04-30 11:02 ` Brian Foster [this message]
2020-04-29 15:05 ` [PATCH 02/11] xfs: remove the xfs_efd_log_item_t typedef Christoph Hellwig
2020-04-30 11:03 ` Brian Foster
2020-04-29 15:05 ` [PATCH 03/11] xfs: remove the xfs_inode_log_item_t typedef Christoph Hellwig
2020-04-30 11:03 ` Brian Foster
2020-04-29 15:05 ` [PATCH 04/11] xfs: factor out a xfs_defer_create_intent helper Christoph Hellwig
2020-04-30 11:03 ` Brian Foster
2020-04-29 15:05 ` [PATCH 05/11] xfs: merge the ->log_item defer op into ->create_intent Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 06/11] xfs: merge the ->diff_items " Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 07/11] xfs: turn dfp_intent into a xfs_log_item Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 08/11] xfs: refactor xfs_defer_finish_noroll Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 09/11] xfs: turn dfp_done into a xfs_log_item Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 10/11] xfs: use a xfs_btree_cur for the ->finish_cleanup state Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-29 15:05 ` [PATCH 11/11] xfs: spell out the parameter name for ->cancel_item Christoph Hellwig
2020-04-30 11:04 ` Brian Foster
2020-04-30 15:35 ` deferred operations cleanup Darrick J. Wong
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=20200430110253.GA5349@bfoster \
--to=bfoster@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.