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

xfs: embedded the attrlist cursor into struct xfs_attr_list_context 



The attrlist cursor only exists as part of an attr list context, so
embedd the structure instead of pointing to it.  Also give it a proper
xfs_ prefix and remove the obsolete typedef.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 254f800f

fs/xfs/libxfs/xfs_attr.h

+3 −3
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ struct xfs_attr_list_context; 
/*

 * Kernel-internal version of the attrlist cursor.

 */

typedef struct attrlist_cursor_kern {

struct xfs_attrlist_cursor_kern {

	__u32	hashval;	/* hash value of next entry to add */

	__u32	blkno;		/* block containing entry (suggestion) */

	__u32	offset;		/* offset in list of equal-hashvals */

	__u16	pad1;		/* padding to match user-level */

	__u8	pad2;		/* padding to match user-level */

	__u8	initted;	/* T/F: cursor has been initialized */

} attrlist_cursor_kern_t;

};





/*========================================================================
@@ -53,7 +53,7 @@ typedef void (*put_listent_func_t)(struct xfs_attr_list_context *, int, 
struct xfs_attr_list_context {

	struct xfs_trans	*tp;

	struct xfs_inode	*dp;		/* inode */

	struct attrlist_cursor_kern *cursor;	/* position in list */

	struct xfs_attrlist_cursor_kern cursor;	/* position in list */

	void			*buffer;	/* output buffer */



	/*

fs/xfs/libxfs/xfs_attr_leaf.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#define	__XFS_ATTR_LEAF_H__



struct attrlist;

struct attrlist_cursor_kern;

struct xfs_attr_list_context;

struct xfs_da_args;

struct xfs_da_state;

fs/xfs/scrub/attr.c

+0 −2
Original line number Diff line number Diff line
@@ -471,7 +471,6 @@ xchk_xattr( 
	struct xfs_scrub		*sc)

{

	struct xchk_xattr		sx;

	struct attrlist_cursor_kern	cursor = { 0 };

	xfs_dablk_t			last_checked = -1U;

	int				error = 0;
@@ -490,7 +489,6 @@ xchk_xattr( 


	/* Check that every attr key can also be looked up by hash. */

	sx.context.dp = sc->ip;

	sx.context.cursor = &cursor;

	sx.context.resynch = 1;

	sx.context.put_listent = xchk_xattr_listent;

	sx.context.tp = sc->tp;

fs/xfs/xfs_attr_list.c

+6 −13
Original line number Diff line number Diff line
@@ -52,24 +52,19 @@ static int 
xfs_attr_shortform_list(

	struct xfs_attr_list_context	*context)

{

	struct attrlist_cursor_kern	*cursor;

	struct xfs_attrlist_cursor_kern	*cursor = &context->cursor;

	struct xfs_inode		*dp = context->dp;

	struct xfs_attr_sf_sort		*sbuf, *sbp;

	struct xfs_attr_shortform	*sf;

	struct xfs_attr_sf_entry	*sfe;

	struct xfs_inode		*dp;

	int				sbsize, nsbuf, count, i;

	int				error = 0;



	ASSERT(context != NULL);

	dp = context->dp;

	ASSERT(dp != NULL);

	ASSERT(dp->i_afp != NULL);

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

	ASSERT(sf != NULL);

	if (!sf->hdr.count)

		return 0;

	cursor = context->cursor;

	ASSERT(cursor != NULL);



	trace_xfs_attr_list_sf(context);
@@ -205,7 +200,7 @@ xfs_attr_shortform_list( 
STATIC int

xfs_attr_node_list_lookup(

	struct xfs_attr_list_context	*context,

	struct attrlist_cursor_kern	*cursor,

	struct xfs_attrlist_cursor_kern	*cursor,

	struct xfs_buf			**pbp)

{

	struct xfs_da3_icnode_hdr	nodehdr;
@@ -288,8 +283,8 @@ STATIC int 
xfs_attr_node_list(

	struct xfs_attr_list_context	*context)

{

	struct xfs_attrlist_cursor_kern	*cursor = &context->cursor;

	struct xfs_attr3_icleaf_hdr	leafhdr;

	struct attrlist_cursor_kern	*cursor;

	struct xfs_attr_leafblock	*leaf;

	struct xfs_da_intnode		*node;

	struct xfs_buf			*bp;
@@ -299,7 +294,6 @@ xfs_attr_node_list( 


	trace_xfs_attr_node_list(context);



	cursor = context->cursor;

	cursor->initted = 1;



	/*
@@ -394,7 +388,7 @@ xfs_attr3_leaf_list_int( 
	struct xfs_buf			*bp,

	struct xfs_attr_list_context	*context)

{

	struct attrlist_cursor_kern	*cursor;

	struct xfs_attrlist_cursor_kern	*cursor = &context->cursor;

	struct xfs_attr_leafblock	*leaf;

	struct xfs_attr3_icleaf_hdr	ichdr;

	struct xfs_attr_leaf_entry	*entries;
@@ -408,7 +402,6 @@ xfs_attr3_leaf_list_int( 
	xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf);

	entries = xfs_attr3_leaf_entryp(leaf);



	cursor = context->cursor;

	cursor->initted = 1;



	/*
@@ -496,7 +489,7 @@ xfs_attr_leaf_list( 


	trace_xfs_attr_leaf_list(context);



	context->cursor->blkno = 0;

	context->cursor.blkno = 0;

	error = xfs_attr3_leaf_read(context->tp, context->dp, 0, &bp);

	if (error)

		return error;

fs/xfs/xfs_ioctl.c

+7 −9
Original line number Diff line number Diff line
@@ -375,8 +375,7 @@ xfs_ioc_attr_list( 
	int				flags,

	struct xfs_attrlist_cursor __user *ucursor)

{

	struct xfs_attr_list_context	context;

	struct attrlist_cursor_kern	cursor;

	struct xfs_attr_list_context	context = { };

	struct xfs_attrlist		*alist;

	void				*buffer;

	int				error;
@@ -396,12 +395,13 @@ xfs_ioc_attr_list( 
	/*

	 * Validate the cursor.

	 */

	if (copy_from_user(&cursor, ucursor, sizeof(cursor)))

	if (copy_from_user(&context.cursor, ucursor, sizeof(context.cursor)))

		return -EFAULT;

	if (cursor.pad1 || cursor.pad2)

	if (context.cursor.pad1 || context.cursor.pad2)

		return -EINVAL;

	if ((cursor.initted == 0) &&

	    (cursor.hashval || cursor.blkno || cursor.offset))

	if (!context.cursor.initted &&

	    (context.cursor.hashval || context.cursor.blkno ||

	     context.cursor.offset))

		return -EINVAL;



	buffer = kmem_zalloc_large(bufsize, 0);
@@ -411,9 +411,7 @@ xfs_ioc_attr_list( 
	/*

	 * Initialize the output buffer.

	 */

	memset(&context, 0, sizeof(context));

	context.dp = dp;

	context.cursor = &cursor;

	context.resynch = 1;

	context.attr_filter = xfs_attr_filter(flags);

	context.buffer = buffer;
@@ -431,7 +429,7 @@ xfs_ioc_attr_list( 
		goto out_free;



	if (copy_to_user(ubuf, buffer, bufsize) ||

	    copy_to_user(ucursor, &cursor, sizeof(cursor)))

	    copy_to_user(ucursor, &context.cursor, sizeof(context.cursor)))

		error = -EFAULT;

out_free:

	kmem_free(buffer);