Re: [REVIEW #2] cleanup - remove bhv_vname_t

[Christoph Hellwig <hch@infradead.org>]

> --- kern_ci.orig/fs/xfs/xfs_dir2.h
> +++ kern_ci/fs/xfs/xfs_dir2.h
> @@ -60,6 +60,16 @@ typedef	__uint32_t	xfs_dir2_db_t;
>  typedef	xfs_off_t	xfs_dir2_off_t;
>
>  /*
> + * Counted string for file names.
> + */
> +struct xfs_name {
> +	const char	*name;
> +	int		len;
> +};
> +
> +extern struct xfs_name	xfs_name_dotdot;

I think these should be in a different header as they are used a lot
outside the low-level directory code.

> +static inline int
> +xfs_dir_check_canenter(uint resblks, struct xfs_trans *tp,
> +				struct xfs_inode *dp, struct xfs_name *name)
> +{
> +	if (resblks)
> +		return 0;
> +	return xfs_dir_canenter(tp, dp, name);;
> +}

Probably makes sense to have this out of line.


>  STATIC int
>  xfs_lock_for_rename(
> -	xfs_inode_t	*dp1,	/* old (source) directory inode */
> -	xfs_inode_t	*dp2,	/* new (target) directory inode */
> -	bhv_vname_t	*vname1,/* old entry name */
> -	bhv_vname_t	*vname2,/* new entry name */
> -	xfs_inode_t	**ipp1,	/* inode of old entry */
> -	xfs_inode_t	**ipp2,	/* inode of new entry, if it
> +	xfs_inode_t	*dp1,	/* in: old (source) directory inode */
> +	xfs_inode_t	*dp2,	/* in: new (target) directory inode */
> +	struct xfs_name	*name2,	/* in: new entry name */
> +	xfs_inode_t	**ipp1,	/* in/out: inode of old entry */
> +	xfs_inode_t	**ipp2,	/* out: inode of new entry, if it
>  				   already exists, NULL otherwise. */
> -	xfs_inode_t	**i_tab,/* array of inode returned, sorted */
> -	int		*num_inodes)  /* number of inodes in array */
> +	xfs_inode_t	**i_tab,/* out: array of inode returned, sorted */
> +	int		*num_inodes)  /* out: number of inodes in array */

This function needs some more love :)

If you follow the flow *ipp1 can never be zeroed out so just pass a
normal *ip1 pointer.  Similarly the loop to find *ipp2 to again
can be killed because we know it's there. New prototype should be
something like:

 STATIC int
 xfs_lock_for_rename(
+	xfs_inode_t	*dp1,	/* in: old (source) directory inode */
+	xfs_inode_t	*dp2,	/* in: new (target) directory inode */
+	xfs_inode_t	*ip1,	/* in: inode of old entry */
+	struct xfs_name	*name2,	/* in: new entry name */
+	xfs_inode_t	**ipp2,	/* out: inode of new entry, if it
  				   already exists, NULL otherwise. */
+	xfs_inode_t	**i_tab,/* out: array of inode returned, sorted */
+	int		*num_inodes)  /* out: number of inodes in array */