Commit 1fb4b0de authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: use xfs_attr_sf_findname in xfs_attr_shortform_getvalue 



xfs_attr_shortform_getvalue duplicates the logic in xfs_attr_sf_findname.
Use the helper instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 22b7b1f5

fs/xfs/libxfs/xfs_attr_leaf.c

+5 −11
Original line number Diff line number Diff line
@@ -848,23 +848,17 @@ int 
xfs_attr_shortform_getvalue(

	struct xfs_da_args		*args)

{

	struct xfs_attr_shortform	*sf = args->dp->i_af.if_data;

	struct xfs_attr_sf_entry	*sfe;

	int				i;



	ASSERT(args->dp->i_af.if_format == XFS_DINODE_FMT_LOCAL);



	trace_xfs_attr_sf_lookup(args);



	sfe = &sf->list[0];

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

				sfe = xfs_attr_sf_nextentry(sfe), i++) {

		if (xfs_attr_match(args, sfe->namelen, sfe->nameval,

				sfe->flags))

			return xfs_attr_copy_value(args,

				&sfe->nameval[args->namelen], sfe->valuelen);

	}

	sfe = xfs_attr_sf_findname(args);

	if (!sfe)

		return -ENOATTR;

	return xfs_attr_copy_value(args, &sfe->nameval[args->namelen],

			sfe->valuelen);

}



/* Convert from using the shortform to the leaf format. */