Commit 59b8b465 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: devirtualize ->data_get_ftype and ->data_put_ftype 



Replace the ->data_get_ftype and ->data_put_ftype dir ops methods with
directly called xfs_dir2_data_get_ftype and xfs_dir2_data_put_ftype
helpers that takes care of the differences between the directory format
with and without the file type field.

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 1848b607

fs/xfs/libxfs/xfs_da_format.c

+0 −47
Original line number Diff line number Diff line
@@ -15,60 +15,13 @@ 
#include "xfs_dir2.h"

#include "xfs_dir2_priv.h"



/*

 * Directory data block operations

 */



static uint8_t

xfs_dir2_data_get_ftype(

	struct xfs_dir2_data_entry *dep)

{

	return XFS_DIR3_FT_UNKNOWN;

}



static void

xfs_dir2_data_put_ftype(

	struct xfs_dir2_data_entry *dep,

	uint8_t			ftype)

{

	ASSERT(ftype < XFS_DIR3_FT_MAX);

}



static uint8_t

xfs_dir3_data_get_ftype(

	struct xfs_dir2_data_entry *dep)

{

	uint8_t		ftype = dep->name[dep->namelen];



	if (ftype >= XFS_DIR3_FT_MAX)

		return XFS_DIR3_FT_UNKNOWN;

	return ftype;

}



static void

xfs_dir3_data_put_ftype(

	struct xfs_dir2_data_entry *dep,

	uint8_t			type)

{

	ASSERT(type < XFS_DIR3_FT_MAX);

	ASSERT(dep->namelen != 0);



	dep->name[dep->namelen] = type;

}



static const struct xfs_dir_ops xfs_dir2_ops = {

	.data_get_ftype = xfs_dir2_data_get_ftype,

	.data_put_ftype = xfs_dir2_data_put_ftype,

};



static const struct xfs_dir_ops xfs_dir2_ftype_ops = {

	.data_get_ftype = xfs_dir3_data_get_ftype,

	.data_put_ftype = xfs_dir3_data_put_ftype,

};



static const struct xfs_dir_ops xfs_dir3_ops = {

	.data_get_ftype = xfs_dir3_data_get_ftype,

	.data_put_ftype = xfs_dir3_data_put_ftype,

};



/*

fs/xfs/libxfs/xfs_dir2.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ extern unsigned char xfs_mode_to_ftype(int mode); 
 * directory operations vector for encode/decode routines

 */

struct xfs_dir_ops {

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

	void	(*data_put_ftype)(struct xfs_dir2_data_entry *dep,

				uint8_t ftype);

};



extern const struct xfs_dir_ops *

fs/xfs/libxfs/xfs_dir2_block.c

+7 −6
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ xfs_dir2_block_addname( 
	dep->inumber = cpu_to_be64(args->inumber);

	dep->namelen = args->namelen;

	memcpy(dep->name, args->name, args->namelen);

	dp->d_ops->data_put_ftype(dep, args->filetype);

	xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);

	tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep);

	*tagp = cpu_to_be16((char *)dep - (char *)hdr);

	/*
@@ -633,7 +633,7 @@ xfs_dir2_block_lookup( 
	 * Fill in inode number, CI name if appropriate, release the block.

	 */

	args->inumber = be64_to_cpu(dep->inumber);

	args->filetype = dp->d_ops->data_get_ftype(dep);

	args->filetype = xfs_dir2_data_get_ftype(dp->i_mount, dep);

	error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);

	xfs_trans_brelse(args->trans, bp);

	return error;
@@ -865,7 +865,7 @@ xfs_dir2_block_replace( 
	 * Change the inode number to the new value.

	 */

	dep->inumber = cpu_to_be64(args->inumber);

	dp->d_ops->data_put_ftype(dep, args->filetype);

	xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);

	xfs_dir2_data_log_entry(args, bp, dep);

	xfs_dir3_data_check(dp, bp);

	return 0;
@@ -1145,7 +1145,7 @@ xfs_dir2_sf_to_block( 
	dep->inumber = cpu_to_be64(dp->i_ino);

	dep->namelen = 1;

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

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

	xfs_dir2_data_put_ftype(mp, dep, XFS_DIR3_FT_DIR);

	tagp = xfs_dir2_data_entry_tag_p(mp, dep);

	*tagp = cpu_to_be16(offset);

	xfs_dir2_data_log_entry(args, bp, dep);
@@ -1160,7 +1160,7 @@ xfs_dir2_sf_to_block( 
	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);

	xfs_dir2_data_put_ftype(mp, dep, XFS_DIR3_FT_DIR);

	tagp = xfs_dir2_data_entry_tag_p(mp, dep);

	*tagp = cpu_to_be16(offset);

	xfs_dir2_data_log_entry(args, bp, dep);
@@ -1210,7 +1210,8 @@ xfs_dir2_sf_to_block( 
		dep = bp->b_addr + newoffset;

		dep->inumber = cpu_to_be64(xfs_dir2_sf_get_ino(mp, sfp, sfep));

		dep->namelen = sfep->namelen;

		dp->d_ops->data_put_ftype(dep, xfs_dir2_sf_get_ftype(mp, sfep));

		xfs_dir2_data_put_ftype(mp, dep,

				xfs_dir2_sf_get_ftype(mp, sfep));

		memcpy(dep->name, sfep->name, dep->namelen);

		tagp = xfs_dir2_data_entry_tag_p(mp, dep);

		*tagp = cpu_to_be16(newoffset);

fs/xfs/libxfs/xfs_dir2_data.c

+31 −12
Original line number Diff line number Diff line
@@ -47,6 +47,34 @@ xfs_dir2_data_entry_tag_p( 
		xfs_dir2_data_entsize(mp, dep->namelen) - sizeof(__be16));

}



uint8_t

xfs_dir2_data_get_ftype(

	struct xfs_mount		*mp,

	struct xfs_dir2_data_entry	*dep)

{

	if (xfs_sb_version_hasftype(&mp->m_sb)) {

		uint8_t			ftype = dep->name[dep->namelen];



		if (likely(ftype < XFS_DIR3_FT_MAX))

			return ftype;

	}



	return XFS_DIR3_FT_UNKNOWN;

}



void

xfs_dir2_data_put_ftype(

	struct xfs_mount		*mp,

	struct xfs_dir2_data_entry	*dep,

	uint8_t				ftype)

{

	ASSERT(ftype < XFS_DIR3_FT_MAX);

	ASSERT(dep->namelen != 0);



	if (xfs_sb_version_hasftype(&mp->m_sb))

		dep->name[dep->namelen] = ftype;

}



/*

 * The number of leaf entries is limited by the size of the block and the amount

 * of space used by the data entries.  We don't know how much space is used by
@@ -88,21 +116,12 @@ __xfs_dir3_data_check( 
	struct xfs_name		name;

	unsigned int		offset;

	unsigned int		end;

	const struct xfs_dir_ops *ops;

	struct xfs_da_geometry	*geo = mp->m_dir_geo;



	/*

	 * We can be passed a null dp here from a verifier, so we need to go the

	 * hard way to get them.

	 */

	ops = xfs_dir_get_ops(mp, dp);



	/*

	 * If this isn't a directory, or we don't get handed the dir ops,

	 * something is seriously wrong.  Bail out.

	 * If this isn't a directory, something is seriously wrong.  Bail out.

	 */

	if ((dp && !S_ISDIR(VFS_I(dp)->i_mode)) ||

	    ops != xfs_dir_get_ops(mp, NULL))

	if (dp && !S_ISDIR(VFS_I(dp)->i_mode))

		return __this_address;



	hdr = bp->b_addr;
@@ -206,7 +225,7 @@ __xfs_dir3_data_check( 
			return __this_address;

		if (be16_to_cpu(*xfs_dir2_data_entry_tag_p(mp, dep)) != offset)

			return __this_address;

		if (ops->data_get_ftype(dep) >= XFS_DIR3_FT_MAX)

		if (xfs_dir2_data_get_ftype(mp, dep) >= XFS_DIR3_FT_MAX)

			return __this_address;

		count++;

		lastfree = 0;

fs/xfs/libxfs/xfs_dir2_leaf.c

+3 −3
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ xfs_dir2_leaf_addname( 
	dep->inumber = cpu_to_be64(args->inumber);

	dep->namelen = args->namelen;

	memcpy(dep->name, args->name, dep->namelen);

	dp->d_ops->data_put_ftype(dep, args->filetype);

	xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);

	tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep);

	*tagp = cpu_to_be16((char *)dep - (char *)hdr);

	/*
@@ -1195,7 +1195,7 @@ xfs_dir2_leaf_lookup( 
	 * Return the found inode number & CI name if appropriate

	 */

	args->inumber = be64_to_cpu(dep->inumber);

	args->filetype = dp->d_ops->data_get_ftype(dep);

	args->filetype = xfs_dir2_data_get_ftype(dp->i_mount, dep);

	error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);

	xfs_trans_brelse(tp, dbp);

	xfs_trans_brelse(tp, lbp);
@@ -1526,7 +1526,7 @@ xfs_dir2_leaf_replace( 
	 * Put the new inode number in, log it.

	 */

	dep->inumber = cpu_to_be64(args->inumber);

	dp->d_ops->data_put_ftype(dep, args->filetype);

	xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);

	tp = args->trans;

	xfs_dir2_data_log_entry(args, dbp, dep);

	xfs_dir3_leaf_check(dp, lbp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE