Re: [PATCH] xfs_db: improve argument naming in set_cur and set_iocur_type

[Bill O'Donnell <billodo@redhat.com>]

On Wed, Jun 28, 2017 at 09:48:18AM -0700, Darrick J. Wong wrote:
> On Wed, Jun 28, 2017 at 10:09:13AM -0500, Bill O'Donnell wrote:
> > In set_cur and set_iocur_type, the current naming for arguments
> > type, block number, and length are t, d, and c, respectively.
> > Replace these with more intuitive and descriptive names:
> 
> Yay!
> 
> > type, blknum, and len. Additionally remove extra blank line
> > in io.c.
> > 
> > Signed-off-by: Bill O'Donnell <billodo@redhat.com>
> > ---
> >  db/io.c | 31 +++++++++++++++----------------
> >  db/io.h |  6 +++---
> >  2 files changed, 18 insertions(+), 19 deletions(-)
> > 
> > diff --git a/db/io.c b/db/io.c
> > index 9918a51d..45cbf3be 100644
> > --- a/db/io.c
> > +++ b/db/io.c
> > @@ -535,9 +535,9 @@ write_cur(void)
> >  
> >  void
> >  set_cur(
> > -	const typ_t	*t,
> > -	__int64_t	d,
> > -	int		c,
> > +	const typ_t	*type,
> > +	__int64_t	blknum,
> 
> /me wonders if this ought to be "xfs_daddr_t blknum" since that's what
> libxfs_readbuf takes?

True. xfs_daddr_t is typedef to __int64_t, and it might make good sense
to become consistent with libxfs_readbuf arg types.


> 
> Other than that,
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> 
> > +	int		len,
> 
> This parameter /ought/ to be unsigned int, because a negative length
> makes no sense and xfs_bufkey and xfs_buf have unsigned int lengths.
> OTOH the libxfs/rdwr.c functions take signed int, so all that can be a
> separate cleanup patch to fix all that.
> 
> --D
> 
> >  	int		ring_flag,
> >  	bbmap_t		*bbmap)
> >  {
> > @@ -545,14 +545,13 @@ set_cur(
> >  	xfs_ino_t	dirino;
> >  	xfs_ino_t	ino;
> >  	__uint16_t	mode;
> > -	const struct xfs_buf_ops *ops = t ? t->bops : NULL;
> > +	const struct xfs_buf_ops *ops = type ? type->bops : NULL;
> >  
> >  	if (iocur_sp < 0) {
> >  		dbprintf(_("set_cur no stack element to set\n"));
> >  		return;
> >  	}
> >  
> > -
> >  	ino = iocur_top->ino;
> >  	dirino = iocur_top->dirino;
> >  	mode = iocur_top->mode;
> > @@ -562,7 +561,7 @@ set_cur(
> >  	if (bbmap) {
> >  #ifdef DEBUG_BBMAP
> >  		int i;
> > -		printf(_("xfs_db got a bbmap for %lld\n"), (long long)d);
> > +		printf(_("xfs_db got a bbmap for %lld\n"), (long long)blknum);
> >  		printf(_("\tblock map"));
> >  		for (i = 0; i < bbmap->nmaps; i++)
> >  			printf(" %lld:%d", (long long)bbmap->b[i].bm_bn,
> > @@ -576,7 +575,7 @@ set_cur(
> >  		bp = libxfs_readbuf_map(mp->m_ddev_targp, bbmap->b,
> >  					bbmap->nmaps, 0, ops);
> >  	} else {
> > -		bp = libxfs_readbuf(mp->m_ddev_targp, d, c, 0, ops);
> > +		bp = libxfs_readbuf(mp->m_ddev_targp, blknum, len, 0, ops);
> >  		iocur_top->bbmap = NULL;
> >  	}
> >  
> > @@ -592,13 +591,13 @@ set_cur(
> >  	if (!ops)
> >  		bp->b_flags |= LIBXFS_B_UNCHECKED;
> >  
> > -	iocur_top->bb = d;
> > -	iocur_top->blen = c;
> > +	iocur_top->bb = blknum;
> > +	iocur_top->blen = len;
> >  	iocur_top->boff = 0;
> >  	iocur_top->data = iocur_top->buf;
> > -	iocur_top->len = BBTOB(c);
> > -	iocur_top->off = d << BBSHIFT;
> > -	iocur_top->typ = cur_typ = t;
> > +	iocur_top->len = BBTOB(len);
> > +	iocur_top->off = blknum << BBSHIFT;
> > +	iocur_top->typ = cur_typ = type;
> >  	iocur_top->ino = ino;
> >  	iocur_top->dirino = dirino;
> >  	iocur_top->mode = mode;
> > @@ -612,16 +611,16 @@ set_cur(
> >  
> >  void
> >  set_iocur_type(
> > -	const typ_t	*t)
> > +	const typ_t	*type)
> >  {
> >  	struct xfs_buf	*bp = iocur_top->bp;
> >  
> > -	iocur_top->typ = t;
> > +	iocur_top->typ = type;
> >  
> >  	/* verify the buffer if the type has one. */
> >  	if (!bp)
> >  		return;
> > -	if (!t->bops) {
> > +	if (!type->bops) {
> >  		bp->b_ops = NULL;
> >  		bp->b_flags |= LIBXFS_B_UNCHECKED;
> >  		return;
> > @@ -629,7 +628,7 @@ set_iocur_type(
> >  	if (!(bp->b_flags & LIBXFS_B_UPTODATE))
> >  		return;
> >  	bp->b_error = 0;
> > -	bp->b_ops = t->bops;
> > +	bp->b_ops = type->bops;
> >  	bp->b_ops->verify_read(bp);
> >  	bp->b_flags &= ~LIBXFS_B_UNCHECKED;
> >  }
> > diff --git a/db/io.h b/db/io.h
> > index b415b82d..ebf51f1d 100644
> > --- a/db/io.h
> > +++ b/db/io.h
> > @@ -59,10 +59,10 @@ extern void	print_iocur(char *tag, iocur_t *ioc);
> >  extern void	push_cur(void);
> >  extern int	read_buf(__int64_t daddr, int count, void *bufp);
> >  extern void     write_cur(void);
> > -extern void	set_cur(const struct typ *t, __int64_t d, int c, int ring_add,
> > -			bbmap_t *bbmap);
> > +extern void	set_cur(const struct typ *type, __int64_t blknum,
> > +			int len, int ring_add, bbmap_t *bbmap);
> >  extern void     ring_add(void);
> > -extern void	set_iocur_type(const struct typ *t);
> > +extern void	set_iocur_type(const struct typ *type);
> >  extern void	xfs_dummy_verify(struct xfs_buf *bp);
> >  extern void	xfs_verify_recalc_inode_crc(struct xfs_buf *bp);
> >  extern void	xfs_verify_recalc_dquot_crc(struct xfs_buf *bp);
> > -- 
> > 2.13.0
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html