Commit 4740175e authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: vectorise remaining shortform dir2 ops 



Following from the initial patch to introduce the directory
operations vector, convert the rest of the shortform directory
operations to use vectored ops rather than superblock feature
checks. This further reduces the size of the built binary:

   text    data     bss     dec     hex filename
 794490   96802    1096  892388   d9de4 fs/xfs/xfs.o.orig
 792986   96802    1096  890884   d9804 fs/xfs/xfs.o.p1
 792350   96802    1096  890248   d9588 fs/xfs/xfs.o.p2

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 32c5483a

fs/xfs/xfs_da_format.c

+152 −0
Original line number Diff line number Diff line
@@ -69,17 +69,169 @@ xfs_dir3_sf_nextentry( 
}





/*

 * For filetype enabled shortform directories, the file type field is stored at

 * the end of the name.  Because it's only a single byte, endian conversion is

 * not necessary. For non-filetype enable directories, the type is always

 * unknown and we never store the value.

 */

static __uint8_t

xfs_dir2_sfe_get_ftype(

	struct xfs_dir2_sf_entry *sfep)

{

	return XFS_DIR3_FT_UNKNOWN;

}



static void

xfs_dir2_sfe_put_ftype(

	struct xfs_dir2_sf_entry *sfep,

	__uint8_t		ftype)

{

	ASSERT(ftype < XFS_DIR3_FT_MAX);

}



static __uint8_t

xfs_dir3_sfe_get_ftype(

	struct xfs_dir2_sf_entry *sfep)

{

	__uint8_t	ftype;



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

	if (ftype >= XFS_DIR3_FT_MAX)

		return XFS_DIR3_FT_UNKNOWN;

	return ftype;

}



static void

xfs_dir3_sfe_put_ftype(

	struct xfs_dir2_sf_entry *sfep,

	__uint8_t		ftype)

{

	ASSERT(ftype < XFS_DIR3_FT_MAX);



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

}



/*

 * Inode numbers in short-form directories can come in two versions,

 * either 4 bytes or 8 bytes wide.  These helpers deal with the

 * two forms transparently by looking at the headers i8count field.

 *

 * For 64-bit inode number the most significant byte must be zero.

 */

static xfs_ino_t

xfs_dir2_sf_get_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	xfs_dir2_inou_t		*from)

{

	if (hdr->i8count)

		return get_unaligned_be64(&from->i8.i) & 0x00ffffffffffffffULL;

	else

		return get_unaligned_be32(&from->i4.i);

}



static void

xfs_dir2_sf_put_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	xfs_dir2_inou_t		*to,

	xfs_ino_t		ino)

{

	ASSERT((ino & 0xff00000000000000ULL) == 0);



	if (hdr->i8count)

		put_unaligned_be64(ino, &to->i8.i);

	else

		put_unaligned_be32(ino, &to->i4.i);

}



static 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

xfs_dir2_sf_put_parent_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	xfs_ino_t		ino)

{

	xfs_dir2_sf_put_ino(hdr, &hdr->parent, ino);

}



/*

 * In short-form directory entries the inode numbers are stored at variable

 * offset behind the entry name. If the entry stores a filetype value, then it

 * sits between the name and the inode number. Hence the inode numbers may only

 * be accessed through the helpers below.

 */

static xfs_ino_t

xfs_dir2_sfe_get_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep)

{

	return xfs_dir2_sf_get_ino(hdr,

				(xfs_dir2_inou_t *)&sfep->name[sfep->namelen]);

}



static void

xfs_dir2_sfe_put_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep,

	xfs_ino_t		ino)

{

	xfs_dir2_sf_put_ino(hdr,

			    (xfs_dir2_inou_t *)&sfep->name[sfep->namelen], ino);

}



static xfs_ino_t

xfs_dir3_sfe_get_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep)

{

	return xfs_dir2_sf_get_ino(hdr,

			(xfs_dir2_inou_t *)&sfep->name[sfep->namelen + 1]);

}



static void

xfs_dir3_sfe_put_ino(

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep,

	xfs_ino_t		ino)

{

	xfs_dir2_sf_put_ino(hdr,

			(xfs_dir2_inou_t *)&sfep->name[sfep->namelen + 1], ino);

}



const struct xfs_dir_ops xfs_dir2_ops = {

	.sf_entsize = xfs_dir2_sf_entsize,

	.sf_nextentry = xfs_dir2_sf_nextentry,

	.sf_get_ftype = xfs_dir2_sfe_get_ftype,

	.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,

};



const struct xfs_dir_ops xfs_dir2_ftype_ops = {

	.sf_entsize = xfs_dir3_sf_entsize,

	.sf_nextentry = xfs_dir3_sf_nextentry,

	.sf_get_ftype = xfs_dir3_sfe_get_ftype,

	.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,

};



const struct xfs_dir_ops xfs_dir3_ops = {

	.sf_entsize = xfs_dir3_sf_entsize,

	.sf_nextentry = xfs_dir3_sf_nextentry,

	.sf_get_ftype = xfs_dir3_sfe_get_ftype,

	.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,

};

fs/xfs/xfs_da_format.h

+0 −47
Original line number Diff line number Diff line
@@ -329,53 +329,6 @@ xfs_dir2_sf_firstentry(struct xfs_dir2_sf_hdr *hdr) 
		((char *)hdr + xfs_dir2_sf_hdr_size(hdr->i8count));

}



/*

 * in dir3 shortform directories, the file type field is stored at a variable

 * offset after the inode number. Because it's only a single byte, endian

 * conversion is not necessary.

 */

static inline __uint8_t *

xfs_dir3_sfe_ftypep(

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep)

{

	return (__uint8_t *)&sfep->name[sfep->namelen];

}



static inline __uint8_t

xfs_dir3_sfe_get_ftype(

	struct xfs_mount	*mp,

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep)

{

	__uint8_t	*ftp;



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

		return XFS_DIR3_FT_UNKNOWN;



	ftp = xfs_dir3_sfe_ftypep(hdr, sfep);

	if (*ftp >= XFS_DIR3_FT_MAX)

		return XFS_DIR3_FT_UNKNOWN;

	return *ftp;

}



static inline void

xfs_dir3_sfe_put_ftype(

	struct xfs_mount	*mp,

	struct xfs_dir2_sf_hdr	*hdr,

	struct xfs_dir2_sf_entry *sfep,

	__uint8_t		ftype)

{

	__uint8_t	*ftp;



	ASSERT(ftype < XFS_DIR3_FT_MAX);



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

		return;

	ftp = xfs_dir3_sfe_ftypep(hdr, sfep);

	*ftp = ftype;

}



/*

 * Data block structures.

 *

fs/xfs/xfs_dir2.h

+11 −9
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ struct xfs_dir_ops { 
	struct xfs_dir2_sf_entry *

		(*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr,

				struct xfs_dir2_sf_entry *sfep);

	__uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep);

	void	(*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep,

				__uint8_t ftype);

	xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr,

				struct xfs_dir2_sf_entry *sfep);

	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);

};



extern const struct xfs_dir_ops xfs_dir2_ops;
@@ -79,15 +90,6 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args); 
/*

 * Interface routines used by userspace utilities

 */

extern xfs_ino_t xfs_dir2_sf_get_parent_ino(struct xfs_dir2_sf_hdr *sfp);

extern void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *sfp,

		xfs_ino_t ino);

extern xfs_ino_t xfs_dir3_sfe_get_ino(struct xfs_mount *mp,

		struct xfs_dir2_sf_hdr *sfp, struct xfs_dir2_sf_entry *sfep);

extern void xfs_dir3_sfe_put_ino(struct xfs_mount *mp,

		struct xfs_dir2_sf_hdr *hdr, struct xfs_dir2_sf_entry *sfep,

		xfs_ino_t ino);



extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r);

extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r);

extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,

fs/xfs/xfs_dir2_block.c

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

	 */

	dep = xfs_dir3_data_dotdot_entry_p(mp, hdr);

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

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

	dep->namelen = 2;

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

	xfs_dir3_dirent_put_ftype(mp, dep, XFS_DIR3_FT_DIR);
@@ -1222,10 +1222,10 @@ xfs_dir2_sf_to_block( 
		 * Copy a real entry.

		 */

		dep = (xfs_dir2_data_entry_t *)((char *)hdr + newoffset);

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

		dep->inumber = cpu_to_be64(dp->d_ops->sf_get_ino(sfp, sfep));

		dep->namelen = sfep->namelen;

		xfs_dir3_dirent_put_ftype(mp, dep,

					xfs_dir3_sfe_get_ftype(mp, sfp, sfep));

					  dp->d_ops->sf_get_ftype(sfep));

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

		tagp = xfs_dir3_data_entry_tag_p(mp, dep);

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

fs/xfs/xfs_dir2_readdir.c

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ xfs_dir2_sf_getdents( 
	 * Put .. entry unless we're starting past it.

	 */

	if (ctx->pos <= dotdot_offset) {

		ino = xfs_dir2_sf_get_parent_ino(sfp);

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

		ctx->pos = dotdot_offset & 0x7fffffff;

		if (!dir_emit(ctx, "..", 2, ino, DT_DIR))

			return 0;
@@ -157,8 +157,8 @@ xfs_dir2_sf_getdents( 
			continue;

		}



		ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);

		filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);

		ino = dp->d_ops->sf_get_ino(sfp, sfep);

		filetype = dp->d_ops->sf_get_ftype(sfep);

		ctx->pos = off & 0x7fffffff;

		if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,

			    xfs_dir3_get_dtype(mp, filetype)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE