Linux XFS filesystem development
 help / color / mirror / Atom feed
From: Chandan Babu R <chandan.babu@oracle.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: chandanrlinux@gmail.com, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 01/14] xfs: remove xfs_btree_cur_t typedef
Date: Mon, 20 Sep 2021 15:23:14 +0530	[thread overview]
Message-ID: <87tuifopdt.fsf@debian-BULLSEYE-live-builder-AMD64> (raw)
In-Reply-To: <163192855540.416199.17796390757325316141.stgit@magnolia>

On 18 Sep 2021 at 06:59, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>

The changes are straightforward replacements.

Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>

> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
>  fs/xfs/libxfs/xfs_alloc.c |   12 ++++++------
>  fs/xfs/libxfs/xfs_bmap.c  |   12 ++++++------
>  fs/xfs/libxfs/xfs_btree.c |   12 ++++++------
>  fs/xfs/libxfs/xfs_btree.h |   12 ++++++------
>  4 files changed, 24 insertions(+), 24 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 95157f5a5a6c..35fb1dd3be95 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -426,8 +426,8 @@ xfs_alloc_fix_len(
>   */
>  STATIC int				/* error code */
>  xfs_alloc_fixup_trees(
> -	xfs_btree_cur_t	*cnt_cur,	/* cursor for by-size btree */
> -	xfs_btree_cur_t	*bno_cur,	/* cursor for by-block btree */
> +	struct xfs_btree_cur *cnt_cur,	/* cursor for by-size btree */
> +	struct xfs_btree_cur *bno_cur,	/* cursor for by-block btree */
>  	xfs_agblock_t	fbno,		/* starting block of free extent */
>  	xfs_extlen_t	flen,		/* length of free extent */
>  	xfs_agblock_t	rbno,		/* starting block of returned extent */
> @@ -1200,8 +1200,8 @@ xfs_alloc_ag_vextent_exact(
>  	xfs_alloc_arg_t	*args)	/* allocation argument structure */
>  {
>  	struct xfs_agf __maybe_unused *agf = args->agbp->b_addr;
> -	xfs_btree_cur_t	*bno_cur;/* by block-number btree cursor */
> -	xfs_btree_cur_t	*cnt_cur;/* by count btree cursor */
> +	struct xfs_btree_cur *bno_cur;/* by block-number btree cursor */
> +	struct xfs_btree_cur *cnt_cur;/* by count btree cursor */
>  	int		error;
>  	xfs_agblock_t	fbno;	/* start block of found extent */
>  	xfs_extlen_t	flen;	/* length of found extent */
> @@ -1658,8 +1658,8 @@ xfs_alloc_ag_vextent_size(
>  	xfs_alloc_arg_t	*args)		/* allocation argument structure */
>  {
>  	struct xfs_agf	*agf = args->agbp->b_addr;
> -	xfs_btree_cur_t	*bno_cur;	/* cursor for bno btree */
> -	xfs_btree_cur_t	*cnt_cur;	/* cursor for cnt btree */
> +	struct xfs_btree_cur *bno_cur;	/* cursor for bno btree */
> +	struct xfs_btree_cur *cnt_cur;	/* cursor for cnt btree */
>  	int		error;		/* error result */
>  	xfs_agblock_t	fbno;		/* start of found freespace */
>  	xfs_extlen_t	flen;		/* length of found freespace */
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index b48230f1a361..499c977cbf56 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -316,7 +316,7 @@ xfs_check_block(
>   */
>  STATIC void
>  xfs_bmap_check_leaf_extents(
> -	xfs_btree_cur_t		*cur,	/* btree cursor or null */
> +	struct xfs_btree_cur	*cur,	/* btree cursor or null */
>  	xfs_inode_t		*ip,		/* incore inode pointer */
>  	int			whichfork)	/* data or attr fork */
>  {
> @@ -925,7 +925,7 @@ xfs_bmap_add_attrfork_btree(
>  	int			*flags)		/* inode logging flags */
>  {
>  	struct xfs_btree_block	*block = ip->i_df.if_broot;
> -	xfs_btree_cur_t		*cur;		/* btree cursor */
> +	struct xfs_btree_cur	*cur;		/* btree cursor */
>  	int			error;		/* error return value */
>  	xfs_mount_t		*mp;		/* file system mount struct */
>  	int			stat;		/* newroot status */
> @@ -968,7 +968,7 @@ xfs_bmap_add_attrfork_extents(
>  	struct xfs_inode	*ip,		/* incore inode pointer */
>  	int			*flags)		/* inode logging flags */
>  {
> -	xfs_btree_cur_t		*cur;		/* bmap btree cursor */
> +	struct xfs_btree_cur	*cur;		/* bmap btree cursor */
>  	int			error;		/* error return value */
>  
>  	if (ip->i_df.if_nextents * sizeof(struct xfs_bmbt_rec) <=
> @@ -1988,11 +1988,11 @@ xfs_bmap_add_extent_unwritten_real(
>  	xfs_inode_t		*ip,	/* incore inode pointer */
>  	int			whichfork,
>  	struct xfs_iext_cursor	*icur,
> -	xfs_btree_cur_t		**curp,	/* if *curp is null, not a btree */
> +	struct xfs_btree_cur	**curp,	/* if *curp is null, not a btree */
>  	xfs_bmbt_irec_t		*new,	/* new data to add to file extents */
>  	int			*logflagsp) /* inode logging flags */
>  {
> -	xfs_btree_cur_t		*cur;	/* btree cursor */
> +	struct xfs_btree_cur	*cur;	/* btree cursor */
>  	int			error;	/* error return value */
>  	int			i;	/* temp state */
>  	struct xfs_ifork	*ifp;	/* inode fork pointer */
> @@ -5045,7 +5045,7 @@ xfs_bmap_del_extent_real(
>  	xfs_inode_t		*ip,	/* incore inode pointer */
>  	xfs_trans_t		*tp,	/* current transaction pointer */
>  	struct xfs_iext_cursor	*icur,
> -	xfs_btree_cur_t		*cur,	/* if null, not a btree */
> +	struct xfs_btree_cur	*cur,	/* if null, not a btree */
>  	xfs_bmbt_irec_t		*del,	/* data to remove from extents */
>  	int			*logflagsp, /* inode logging flags */
>  	int			whichfork, /* data or attr fork */
> diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
> index 298395481713..b0cce0932f02 100644
> --- a/fs/xfs/libxfs/xfs_btree.c
> +++ b/fs/xfs/libxfs/xfs_btree.c
> @@ -388,14 +388,14 @@ xfs_btree_del_cursor(
>   */
>  int					/* error */
>  xfs_btree_dup_cursor(
> -	xfs_btree_cur_t	*cur,		/* input cursor */
> -	xfs_btree_cur_t	**ncur)		/* output cursor */
> +	struct xfs_btree_cur *cur,		/* input cursor */
> +	struct xfs_btree_cur **ncur)		/* output cursor */
>  {
>  	struct xfs_buf	*bp;		/* btree block's buffer pointer */
>  	int		error;		/* error return value */
>  	int		i;		/* level number of btree block */
>  	xfs_mount_t	*mp;		/* mount structure for filesystem */
> -	xfs_btree_cur_t	*new;		/* new cursor value */
> +	struct xfs_btree_cur *new;		/* new cursor value */
>  	xfs_trans_t	*tp;		/* transaction pointer, can be NULL */
>  
>  	tp = cur->bc_tp;
> @@ -691,7 +691,7 @@ xfs_btree_get_block(
>   */
>  STATIC int				/* success=1, failure=0 */
>  xfs_btree_firstrec(
> -	xfs_btree_cur_t		*cur,	/* btree cursor */
> +	struct xfs_btree_cur	*cur,	/* btree cursor */
>  	int			level)	/* level to change */
>  {
>  	struct xfs_btree_block	*block;	/* generic btree block pointer */
> @@ -721,7 +721,7 @@ xfs_btree_firstrec(
>   */
>  STATIC int				/* success=1, failure=0 */
>  xfs_btree_lastrec(
> -	xfs_btree_cur_t		*cur,	/* btree cursor */
> +	struct xfs_btree_cur	*cur,	/* btree cursor */
>  	int			level)	/* level to change */
>  {
>  	struct xfs_btree_block	*block;	/* generic btree block pointer */
> @@ -985,7 +985,7 @@ xfs_btree_readahead_ptr(
>   */
>  STATIC void
>  xfs_btree_setbuf(
> -	xfs_btree_cur_t		*cur,	/* btree cursor */
> +	struct xfs_btree_cur	*cur,	/* btree cursor */
>  	int			lev,	/* level in btree */
>  	struct xfs_buf		*bp)	/* new buffer to set */
>  {
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 4eaf8517f850..513ade4a89f8 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -216,7 +216,7 @@ struct xfs_btree_cur_ino {
>   * Btree cursor structure.
>   * This collects all information needed by the btree code in one place.
>   */
> -typedef struct xfs_btree_cur
> +struct xfs_btree_cur
>  {
>  	struct xfs_trans	*bc_tp;	/* transaction we're in, if any */
>  	struct xfs_mount	*bc_mp;	/* file system mount struct */
> @@ -243,7 +243,7 @@ typedef struct xfs_btree_cur
>  		struct xfs_btree_cur_ag	bc_ag;
>  		struct xfs_btree_cur_ino bc_ino;
>  	};
> -} xfs_btree_cur_t;
> +};
>  
>  /* cursor flags */
>  #define XFS_BTREE_LONG_PTRS		(1<<0)	/* pointers are 64bits long */
> @@ -309,7 +309,7 @@ xfs_btree_check_sptr(
>   */
>  void
>  xfs_btree_del_cursor(
> -	xfs_btree_cur_t		*cur,	/* btree cursor */
> +	struct xfs_btree_cur	*cur,	/* btree cursor */
>  	int			error);	/* del because of error */
>  
>  /*
> @@ -318,8 +318,8 @@ xfs_btree_del_cursor(
>   */
>  int					/* error */
>  xfs_btree_dup_cursor(
> -	xfs_btree_cur_t		*cur,	/* input cursor */
> -	xfs_btree_cur_t		**ncur);/* output cursor */
> +	struct xfs_btree_cur		*cur,	/* input cursor */
> +	struct xfs_btree_cur		**ncur);/* output cursor */
>  
>  /*
>   * Compute first and last byte offsets for the fields given.
> @@ -527,7 +527,7 @@ struct xfs_ifork *xfs_btree_ifork_ptr(struct xfs_btree_cur *cur);
>  /* Does this cursor point to the last block in the given level? */
>  static inline bool
>  xfs_btree_islastblock(
> -	xfs_btree_cur_t		*cur,
> +	struct xfs_btree_cur	*cur,
>  	int			level)
>  {
>  	struct xfs_btree_block	*block;


-- 
chandan

  reply	other threads:[~2021-09-20 10:09 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-18  1:29 [PATCHSET RFC chandan 00/14] xfs: support dynamic btree cursor height Darrick J. Wong
2021-09-18  1:29 ` [PATCH 01/14] xfs: remove xfs_btree_cur_t typedef Darrick J. Wong
2021-09-20  9:53   ` Chandan Babu R [this message]
2021-09-21  8:36   ` Christoph Hellwig
2021-09-18  1:29 ` [PATCH 02/14] xfs: don't allocate scrub contexts on the stack Darrick J. Wong
2021-09-20  9:53   ` Chandan Babu R
2021-09-20 17:39     ` Darrick J. Wong
2021-09-21  8:39   ` Christoph Hellwig
2021-09-18  1:29 ` [PATCH 03/14] xfs: dynamically allocate btree scrub context structure Darrick J. Wong
2021-09-20  9:53   ` Chandan Babu R
2021-09-21  8:43   ` Christoph Hellwig
2021-09-22 16:17     ` Darrick J. Wong
2021-09-18  1:29 ` [PATCH 04/14] xfs: stricter btree height checking when looking for errors Darrick J. Wong
2021-09-20  9:54   ` Chandan Babu R
2021-09-18  1:29 ` [PATCH 05/14] xfs: stricter btree height checking when scanning for btree roots Darrick J. Wong
2021-09-20  9:54   ` Chandan Babu R
2021-09-18  1:29 ` [PATCH 06/14] xfs: check that bc_nlevels never overflows Darrick J. Wong
2021-09-20  9:54   ` Chandan Babu R
2021-09-21  8:44   ` Christoph Hellwig
2021-09-18  1:29 ` [PATCH 07/14] xfs: support dynamic btree cursor heights Darrick J. Wong
2021-09-20  9:55   ` Chandan Babu R
2021-09-21  8:49   ` Christoph Hellwig
2021-09-18  1:29 ` [PATCH 08/14] xfs: refactor btree cursor allocation function Darrick J. Wong
2021-09-20  9:55   ` Chandan Babu R
2021-09-21  8:53   ` Christoph Hellwig
2021-09-18  1:29 ` [PATCH 09/14] xfs: fix maxlevels comparisons in the btree staging code Darrick J. Wong
2021-09-20  9:55   ` Chandan Babu R
2021-09-21  8:56   ` Christoph Hellwig
2021-09-22 15:59     ` Darrick J. Wong
2021-09-18  1:30 ` [PATCH 10/14] xfs: encode the max btree height in the cursor Darrick J. Wong
2021-09-20  9:55   ` Chandan Babu R
2021-09-21  8:57   ` Christoph Hellwig
2021-09-18  1:30 ` [PATCH 11/14] xfs: dynamically allocate cursors based on maxlevels Darrick J. Wong
2021-09-20  9:56   ` Chandan Babu R
2021-09-20 23:06   ` Dave Chinner
2021-09-20 23:36     ` Dave Chinner
2021-09-21  9:03     ` Christoph Hellwig
2021-09-22 18:55       ` Darrick J. Wong
2021-09-22 17:38     ` Darrick J. Wong
2021-09-22 23:10       ` Dave Chinner
2021-09-23  1:58         ` Darrick J. Wong
2021-09-23  5:56           ` Chandan Babu R
2021-09-18  1:30 ` [PATCH 12/14] xfs: compute actual maximum btree height for critical reservation calculation Darrick J. Wong
2021-09-20  9:56   ` Chandan Babu R
2021-09-18  1:30 ` [PATCH 13/14] xfs: compute the maximum height of the rmap btree when reflink enabled Darrick J. Wong
2021-09-20  9:56   ` Chandan Babu R
2021-09-18  1:30 ` [PATCH 14/14] xfs: kill XFS_BTREE_MAXLEVELS Darrick J. Wong
2021-09-20  9:57   ` Chandan Babu R

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=87tuifopdt.fsf@debian-BULLSEYE-live-builder-AMD64 \
    --to=chandan.babu@oracle.com \
    --cc=chandanrlinux@gmail.com \
    --cc=djwong@kernel.org \
    --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