xfs: remove typedef xfs_attr_sf_entry_t (6337c844) · Commits · 戴 / test

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ xfs_attr_shortform_add(
		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;
		sfe = (xfs_attr_sf_entry_t )((char )sf + offset);
		sfe = (struct xfs_attr_sf_entry )((char )sf + offset);

		sfe->namelen = args->namelen;
		sfe->valuelen = args->valuelen;
		@@ -838,7 +838,7 @@ int
		xfs_attr_shortform_lookup(xfs_da_args_t *args)
		{
		xfs_attr_shortform_t *sf;
		xfs_attr_sf_entry_t *sfe;
		struct xfs_attr_sf_entry *sfe;
		int i;
		struct xfs_ifork *ifp;

+6 −5

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@
		* to fit into the literal area of the inode.
		*/
		typedef struct xfs_attr_sf_hdr xfs_attr_sf_hdr_t;
		typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t;

		/*
		* We generate this then sort it, attr_list() must return things in hash-order.
		@@ -28,15 +27,17 @@ typedef struct xfs_attr_sf_sort {
		} xfs_attr_sf_sort_t;

		#define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \
		(((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen)))
		(((int)sizeof(struct xfs_attr_sf_entry)-1 + (nlen)+(vlen)))
		#define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \
		((1 << (NBBY*(int)sizeof(uint8_t))) - 1)
		#define XFS_ATTR_SF_ENTSIZE(sfep) /* space an entry uses */ \
		((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen)
		((int)sizeof(struct xfs_attr_sf_entry)-1 + \
		(sfep)->namelen+(sfep)->valuelen)
		#define XFS_ATTR_SF_NEXTENTRY(sfep) /* next entry in struct */ \
		((xfs_attr_sf_entry_t )((char )(sfep) + XFS_ATTR_SF_ENTSIZE(sfep)))
		((struct xfs_attr_sf_entry )((char )(sfep) + \
		XFS_ATTR_SF_ENTSIZE(sfep)))
		#define XFS_ATTR_SF_TOTSIZE(dp) /* total space in use */ \
		(be16_to_cpu(((xfs_attr_shortform_t *) \
		(be16_to_cpu(((struct xfs_attr_shortform *) \
		((dp)->i_afp->if_u1.if_data))->hdr.totsize))

		#endif /* __XFS_ATTR_SF_H__ */