Commit 84915e1b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino 



The parent inode handling is the same for all directory format variants,
just use direct calls instead of going through a pointless indirect
call.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 3d92c93b

fs/xfs/libxfs/xfs_da_format.c

+2 −8
Original line number Diff line number Diff line
@@ -132,14 +132,14 @@ xfs_dir2_sf_put_ino( 
		put_unaligned_be32(ino, to);

}



static xfs_ino_t

xfs_ino_t

xfs_dir2_sf_get_parent_ino(

	struct xfs_dir2_sf_hdr	*hdr)

{

	return xfs_dir2_sf_get_ino(hdr, hdr->parent);

}



static void

void

xfs_dir2_sf_put_parent_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	xfs_ino_t		ino)
@@ -407,8 +407,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { 
	.sf_put_ftype = xfs_dir2_sfe_put_ftype,

	.sf_get_ino = xfs_dir2_sfe_get_ino,

	.sf_put_ino = xfs_dir2_sfe_put_ino,

	.sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,

	.sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,



	.data_entsize = xfs_dir2_data_entsize,

	.data_get_ftype = xfs_dir2_data_get_ftype,
@@ -438,8 +436,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { 
	.sf_put_ftype = xfs_dir3_sfe_put_ftype,

	.sf_get_ino = xfs_dir3_sfe_get_ino,

	.sf_put_ino = xfs_dir3_sfe_put_ino,

	.sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,

	.sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,



	.data_entsize = xfs_dir3_data_entsize,

	.data_get_ftype = xfs_dir3_data_get_ftype,
@@ -469,8 +465,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = { 
	.sf_put_ftype = xfs_dir3_sfe_put_ftype,

	.sf_get_ino = xfs_dir3_sfe_get_ino,

	.sf_put_ino = xfs_dir3_sfe_put_ino,

	.sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,

	.sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,



	.data_entsize = xfs_dir3_data_entsize,

	.data_get_ftype = xfs_dir3_data_get_ftype,

fs/xfs/libxfs/xfs_dir2.h

+0 −3
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ struct xfs_dir_ops { 
	void	(*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr,

			      struct xfs_dir2_sf_entry *sfep,

			      xfs_ino_t ino);

	xfs_ino_t (*sf_get_parent_ino)(struct xfs_dir2_sf_hdr *hdr);

	void	(*sf_put_parent_ino)(struct xfs_dir2_sf_hdr *hdr,

				     xfs_ino_t ino);



	int	(*data_entsize)(int len);

	uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);

fs/xfs/libxfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ xfs_dir2_sf_to_block( 
	 * Create entry for ..

	 */

	dep = dp->d_ops->data_dotdot_entry_p(hdr);

	dep->inumber = cpu_to_be64(dp->d_ops->sf_get_parent_ino(sfp));

	dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));

	dep->namelen = 2;

	dep->name[0] = dep->name[1] = '.';

	dp->d_ops->data_put_ftype(dep, XFS_DIR3_FT_DIR);

fs/xfs/libxfs/xfs_dir2_priv.h

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ extern int xfs_dir2_free_read(struct xfs_trans *tp, struct xfs_inode *dp, 
		xfs_dablk_t fbno, struct xfs_buf **bpp);



/* xfs_dir2_sf.c */

xfs_ino_t xfs_dir2_sf_get_parent_ino(struct xfs_dir2_sf_hdr *hdr);

void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *hdr, xfs_ino_t ino);

extern int xfs_dir2_block_sfsize(struct xfs_inode *dp,

		struct xfs_dir2_data_hdr *block, struct xfs_dir2_sf_hdr *sfhp);

extern int xfs_dir2_block_to_sf(struct xfs_da_args *args, struct xfs_buf *bp,

fs/xfs/libxfs/xfs_dir2_sf.c

+10 −10
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ xfs_dir2_block_sfsize( 
	 */

	sfhp->count = count;

	sfhp->i8count = i8count;

	dp->d_ops->sf_put_parent_ino(sfhp, parent);

	xfs_dir2_sf_put_parent_ino(sfhp, parent);

	return size;

}
@@ -204,7 +204,7 @@ xfs_dir2_block_to_sf( 
		else if (dep->namelen == 2 &&

			 dep->name[0] == '.' && dep->name[1] == '.')

			ASSERT(be64_to_cpu(dep->inumber) ==

			       dp->d_ops->sf_get_parent_ino(sfp));

			       xfs_dir2_sf_get_parent_ino(sfp));

		/*

		 * Normal entry, copy it into shortform.

		 */
@@ -584,7 +584,7 @@ xfs_dir2_sf_check( 


	sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;

	offset = dp->d_ops->data_first_offset;

	ino = dp->d_ops->sf_get_parent_ino(sfp);

	ino = xfs_dir2_sf_get_parent_ino(sfp);

	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;



	for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp);
@@ -647,7 +647,7 @@ xfs_dir2_sf_verify( 
	endp = (char *)sfp + size;



	/* Check .. entry */

	ino = dops->sf_get_parent_ino(sfp);

	ino = xfs_dir2_sf_get_parent_ino(sfp);

	i8count = ino > XFS_DIR2_MAX_SHORT_INUM;

	error = xfs_dir_ino_validate(mp, ino);

	if (error)
@@ -757,7 +757,7 @@ xfs_dir2_sf_create( 
	/*

	 * Now can put in the inode number, since i8count is set.

	 */

	dp->d_ops->sf_put_parent_ino(sfp, pino);

	xfs_dir2_sf_put_parent_ino(sfp, pino);

	sfp->count = 0;

	dp->i_d.di_size = size;

	xfs_dir2_sf_check(args);
@@ -806,7 +806,7 @@ xfs_dir2_sf_lookup( 
	 */

	if (args->namelen == 2 &&

	    args->name[0] == '.' && args->name[1] == '.') {

		args->inumber = dp->d_ops->sf_get_parent_ino(sfp);

		args->inumber = xfs_dir2_sf_get_parent_ino(sfp);

		args->cmpresult = XFS_CMP_EXACT;

		args->filetype = XFS_DIR3_FT_DIR;

		return -EEXIST;
@@ -984,9 +984,9 @@ xfs_dir2_sf_replace( 
	 */

	if (args->namelen == 2 &&

	    args->name[0] == '.' && args->name[1] == '.') {

		ino = dp->d_ops->sf_get_parent_ino(sfp);

		ino = xfs_dir2_sf_get_parent_ino(sfp);

		ASSERT(args->inumber != ino);

		dp->d_ops->sf_put_parent_ino(sfp, args->inumber);

		xfs_dir2_sf_put_parent_ino(sfp, args->inumber);

	}

	/*

	 * Normal entry, look for the name.
@@ -1092,7 +1092,7 @@ xfs_dir2_sf_toino4( 
	 */

	sfp->count = oldsfp->count;

	sfp->i8count = 0;

	dp->d_ops->sf_put_parent_ino(sfp, dp->d_ops->sf_get_parent_ino(oldsfp));

	xfs_dir2_sf_put_parent_ino(sfp, xfs_dir2_sf_get_parent_ino(oldsfp));

	/*

	 * Copy the entries field by field.

	 */
@@ -1165,7 +1165,7 @@ xfs_dir2_sf_toino8( 
	 */

	sfp->count = oldsfp->count;

	sfp->i8count = 1;

	dp->d_ops->sf_put_parent_ino(sfp, dp->d_ops->sf_get_parent_ino(oldsfp));

	xfs_dir2_sf_put_parent_ino(sfp, xfs_dir2_sf_get_parent_ino(oldsfp));

	/*

	 * Copy the entries field by field.

	 */