Commit 47e6cc10 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong
Browse files

xfs: Remove typedef xfs_attr_shortform_t 



Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 6337c844

fs/xfs/libxfs/xfs_attr_leaf.c

+8 −8
Original line number Diff line number Diff line
@@ -728,14 +728,14 @@ xfs_attr_shortform_add( 


	ifp = dp->i_afp;

	ASSERT(ifp->if_flags & XFS_IFINLINE);

	sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	if (xfs_attr_sf_findname(args, &sfe, NULL) == -EEXIST)

		ASSERT(0);



	offset = (char *)sfe - (char *)sf;

	size = XFS_ATTR_SF_ENTSIZE_BYNAME(args->namelen, args->valuelen);

	xfs_idata_realloc(dp, size, XFS_ATTR_FORK);

	sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	sfe = (struct xfs_attr_sf_entry *)((char *)sf + offset);



	sfe->namelen = args->namelen;
@@ -787,7 +787,7 @@ xfs_attr_shortform_remove( 


	dp = args->dp;

	mp = dp->i_mount;

	sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;



	error = xfs_attr_sf_findname(args, &sfe, &base);

	if (error != -EEXIST)
@@ -837,7 +837,7 @@ xfs_attr_shortform_remove( 
int

xfs_attr_shortform_lookup(xfs_da_args_t *args)

{

	xfs_attr_shortform_t *sf;

	struct xfs_attr_shortform *sf;

	struct xfs_attr_sf_entry *sfe;

	int i;

	struct xfs_ifork *ifp;
@@ -846,7 +846,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args) 


	ifp = args->dp->i_afp;

	ASSERT(ifp->if_flags & XFS_IFINLINE);

	sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	sfe = &sf->list[0];

	for (i = 0; i < sf->hdr.count;

				sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) {
@@ -873,7 +873,7 @@ xfs_attr_shortform_getvalue( 
	int			i;



	ASSERT(args->dp->i_afp->if_flags == XFS_IFINLINE);

	sf = (xfs_attr_shortform_t *)args->dp->i_afp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)args->dp->i_afp->if_u1.if_data;

	sfe = &sf->list[0];

	for (i = 0; i < sf->hdr.count;

				sfe = XFS_ATTR_SF_NEXTENTRY(sfe), i++) {
@@ -908,12 +908,12 @@ xfs_attr_shortform_to_leaf( 


	dp = args->dp;

	ifp = dp->i_afp;

	sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	size = be16_to_cpu(sf->hdr.totsize);

	tmpbuffer = kmem_alloc(size, 0);

	ASSERT(tmpbuffer != NULL);

	memcpy(tmpbuffer, ifp->if_u1.if_data, size);

	sf = (xfs_attr_shortform_t *)tmpbuffer;

	sf = (struct xfs_attr_shortform *)tmpbuffer;



	xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);

	xfs_bmap_local_to_extents_empty(args->trans, dp, XFS_ATTR_FORK);

fs/xfs/libxfs/xfs_da_format.h

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ xfs_dir2_block_leaf_p(struct xfs_dir2_block_tail *btp) 
/*

 * Entries are packed toward the top as tight as possible.

 */

typedef struct xfs_attr_shortform {

struct xfs_attr_shortform {

	struct xfs_attr_sf_hdr {	/* constant-structure header block */

		__be16	totsize;	/* total bytes in shortform list */

		__u8	count;	/* count of active entries */
@@ -591,7 +591,7 @@ typedef struct xfs_attr_shortform { 
		uint8_t flags;	/* flags bits (see xfs_attr_leaf.h) */

		uint8_t nameval[1];	/* name & value bytes concatenated */

	} list[1];			/* variable sized array */

} xfs_attr_shortform_t;

};



typedef struct xfs_attr_leaf_map {	/* RLE map of free bytes */

	__be16	base;			  /* base of free region */

fs/xfs/xfs_attr_list.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ xfs_attr_shortform_list( 
	int				error = 0;



	ASSERT(dp->i_afp != NULL);

	sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;

	sf = (struct xfs_attr_shortform *)dp->i_afp->if_u1.if_data;

	ASSERT(sf != NULL);

	if (!sf->hdr.count)

		return 0;

fs/xfs/xfs_ondisk.h

+6 −6
Original line number Diff line number Diff line
@@ -89,12 +89,12 @@ xfs_check_ondisk_structs(void) 
	XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, namelen,	8);

	XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, name,	9);

	XFS_CHECK_STRUCT_SIZE(xfs_attr_leafblock_t,		40);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, hdr.totsize,	0);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, hdr.count,	2);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].namelen,	4);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].valuelen, 5);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].flags,	6);

	XFS_CHECK_OFFSET(xfs_attr_shortform_t, list[0].nameval,	7);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.totsize, 0);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, hdr.count,	 2);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].namelen,	4);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].valuelen,	5);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].flags,	6);

	XFS_CHECK_OFFSET(struct xfs_attr_shortform, list[0].nameval,	7);

	XFS_CHECK_STRUCT_SIZE(xfs_da_blkinfo_t,			12);

	XFS_CHECK_STRUCT_SIZE(xfs_da_intnode_t,			16);

	XFS_CHECK_STRUCT_SIZE(xfs_da_node_entry_t,		8);