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

xfs: clean up the attr flag confusion 



The ATTR_* flags have a long IRIX history, where they a userspace
interface, the on-disk format and an internal interface.  We've split
out the on-disk interface to the XFS_ATTR_* values, but despite (or
because?) of that the flag have still been a mess.  Switch the
internal interface to pass the on-disk XFS_ATTR_* flags for the
namespace and the Linux XATTR_* flags for the actual flags instead.
The ATTR_* values that are actually used are move to xfs_fs.h with a
new XFS_IOC_* prefix to not conflict with the userspace version that
has the same name and must have the same value.

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 f3e93d95

fs/xfs/libxfs/xfs_attr.c

+8 −8
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ xfs_attr_set( 
	struct xfs_inode	*dp = args->dp;

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_trans_res	tres;

	int			rsvd = (args->flags & ATTR_ROOT) != 0;

	bool			rsvd = (args->attr_filter & XFS_ATTR_ROOT);

	int			error, local;

	unsigned int		total;
@@ -423,10 +423,10 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) 
	trace_xfs_attr_sf_addname(args);



	retval = xfs_attr_shortform_lookup(args);

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

	if (retval == -ENOATTR && (args->attr_flags & XATTR_REPLACE))

		return retval;

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)

		if (args->attr_flags & XATTR_CREATE)

			return retval;

		retval = xfs_attr_shortform_remove(args);

		if (retval)
@@ -436,7 +436,7 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) 
		 * that the leaf format add routine won't trip over the attr

		 * not being around.

		 */

		args->flags &= ~ATTR_REPLACE;

		args->attr_flags &= ~XATTR_REPLACE;

	}



	if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
@@ -489,10 +489,10 @@ xfs_attr_leaf_addname( 
	 * the given flags produce an error or call for an atomic rename.

	 */

	retval = xfs_attr3_leaf_lookup_int(bp, args);

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

	if (retval == -ENOATTR && (args->attr_flags & XATTR_REPLACE))

		goto out_brelse;

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)	/* pure create op */

		if (args->attr_flags & XATTR_CREATE)

			goto out_brelse;



		trace_xfs_attr_leaf_replace(args);
@@ -763,10 +763,10 @@ xfs_attr_node_addname( 
		goto out;

	blk = &state->path.blk[ state->path.active-1 ];

	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

	if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))

	if (retval == -ENOATTR && (args->attr_flags & XATTR_REPLACE))

		goto out;

	if (retval == -EEXIST) {

		if (args->flags & ATTR_CREATE)

		if (args->attr_flags & XATTR_CREATE)

			goto out;



		trace_xfs_attr_node_replace(args);

fs/xfs/libxfs/xfs_attr.h

+1 −21
Original line number Diff line number Diff line
@@ -21,26 +21,6 @@ struct xfs_attr_list_context; 
 * as possible so as to fit into the literal area of the inode.

 */



/*========================================================================

 * External interfaces

 *========================================================================*/





#define ATTR_DONTFOLLOW	0x0001	/* -- ignored, from IRIX -- */

#define ATTR_ROOT	0x0002	/* use attrs in root (trusted) namespace */

#define ATTR_TRUST	0x0004	/* -- unused, from IRIX -- */

#define ATTR_SECURE	0x0008	/* use attrs in security namespace */

#define ATTR_CREATE	0x0010	/* pure create: fail if attr already exists */

#define ATTR_REPLACE	0x0020	/* pure set: fail if attr does not exist */



#define XFS_ATTR_FLAGS \

	{ ATTR_DONTFOLLOW, 	"DONTFOLLOW" }, \

	{ ATTR_ROOT,		"ROOT" }, \

	{ ATTR_TRUST,		"TRUST" }, \

	{ ATTR_SECURE,		"SECURE" }, \

	{ ATTR_CREATE,		"CREATE" }, \

	{ ATTR_REPLACE,		"REPLACE" }



/*

 * The maximum size (into the kernel or returned from the kernel) of an

 * attribute value or the buffer used for an attr_list() call.  Larger
@@ -87,7 +67,7 @@ struct xfs_attr_list_context { 
	int			dupcnt;		/* count dup hashvals seen */

	int			bufsize;	/* total buffer size */

	int			firstu;		/* first used byte in buffer */

	int			flags;		/* from VOP call */

	unsigned int		attr_filter;	/* XFS_ATTR_{ROOT,SECURE} */

	int			resynch;	/* T/F: resynch with cursor */

	put_listent_func_t	put_listent;	/* list output fmt function */

	int			index;		/* index into output buffer */

fs/xfs/libxfs/xfs_attr_leaf.c

+7 −7
Original line number Diff line number Diff line
@@ -456,8 +456,7 @@ xfs_attr_match( 
		return false;

	if (memcmp(args->name, name, namelen) != 0)

		return false;

	if (XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags) !=

	    XFS_ATTR_NSP_ONDISK(flags))

	if (args->attr_filter != (flags & XFS_ATTR_NSP_ONDISK_MASK))

		return false;

	return true;

}
@@ -697,7 +696,7 @@ xfs_attr_shortform_add(xfs_da_args_t *args, int forkoff) 


	sfe->namelen = args->namelen;

	sfe->valuelen = args->valuelen;

	sfe->flags = XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags);

	sfe->flags = args->attr_filter;

	memcpy(sfe->nameval, args->name, args->namelen);

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

	sf->hdr.count++;
@@ -906,7 +905,7 @@ xfs_attr_shortform_to_leaf( 
		nargs.valuelen = sfe->valuelen;

		nargs.hashval = xfs_da_hashname(sfe->nameval,

						sfe->namelen);

		nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(sfe->flags);

		nargs.attr_filter = sfe->flags & XFS_ATTR_NSP_ONDISK_MASK;

		error = xfs_attr3_leaf_lookup_int(bp, &nargs); /* set a->index */

		ASSERT(error == -ENOATTR);

		error = xfs_attr3_leaf_add(bp, &nargs);
@@ -1112,7 +1111,7 @@ xfs_attr3_leaf_to_shortform( 
		nargs.value = &name_loc->nameval[nargs.namelen];

		nargs.valuelen = be16_to_cpu(name_loc->valuelen);

		nargs.hashval = be32_to_cpu(entry->hashval);

		nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(entry->flags);

		nargs.attr_filter = entry->flags & XFS_ATTR_NSP_ONDISK_MASK;

		xfs_attr_shortform_add(&nargs, forkoff);

	}

	error = 0;
@@ -1437,8 +1436,9 @@ xfs_attr3_leaf_add_work( 
	entry->nameidx = cpu_to_be16(ichdr->freemap[mapindex].base +

				     ichdr->freemap[mapindex].size);

	entry->hashval = cpu_to_be32(args->hashval);

	entry->flags = tmp ? XFS_ATTR_LOCAL : 0;

	entry->flags |= XFS_ATTR_NSP_ARGS_TO_ONDISK(args->flags);

	entry->flags = args->attr_filter;

	if (tmp)

		entry->flags |= XFS_ATTR_LOCAL;

	if (args->op_flags & XFS_DA_OP_RENAME) {

		entry->flags |= XFS_ATTR_INCOMPLETE;

		if ((args->blkno2 == args->blkno) &&

fs/xfs/libxfs/xfs_da_btree.h

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ typedef struct xfs_da_args { 
	uint8_t		filetype;	/* filetype of inode for directories */

	void		*value;		/* set of bytes (maybe contain NULLs) */

	int		valuelen;	/* length of value */

	int		flags;		/* argument flags (eg: ATTR_NOCREATE) */

	unsigned int	attr_filter;	/* XFS_ATTR_{ROOT,SECURE} */

	unsigned int	attr_flags;	/* XATTR_{CREATE,REPLACE} */

	xfs_dahash_t	hashval;	/* hash value of name */

	xfs_ino_t	inumber;	/* input/output inode number */

	struct xfs_inode *dp;		/* directory inode to manipulate */

fs/xfs/libxfs/xfs_da_format.h

+0 −12
Original line number Diff line number Diff line
@@ -692,19 +692,7 @@ struct xfs_attr3_leafblock { 
#define XFS_ATTR_ROOT		(1 << XFS_ATTR_ROOT_BIT)

#define XFS_ATTR_SECURE		(1 << XFS_ATTR_SECURE_BIT)

#define XFS_ATTR_INCOMPLETE	(1 << XFS_ATTR_INCOMPLETE_BIT)



/*

 * Conversion macros for converting namespace bits from argument flags

 * to ondisk flags.

 */

#define XFS_ATTR_NSP_ARGS_MASK		(ATTR_ROOT | ATTR_SECURE)

#define XFS_ATTR_NSP_ONDISK_MASK	(XFS_ATTR_ROOT | XFS_ATTR_SECURE)

#define XFS_ATTR_NSP_ONDISK(flags)	((flags) & XFS_ATTR_NSP_ONDISK_MASK)

#define XFS_ATTR_NSP_ARGS(flags)	((flags) & XFS_ATTR_NSP_ARGS_MASK)

#define XFS_ATTR_NSP_ARGS_TO_ONDISK(x)	(((x) & ATTR_ROOT ? XFS_ATTR_ROOT : 0) |\

					 ((x) & ATTR_SECURE ? XFS_ATTR_SECURE : 0))

#define XFS_ATTR_NSP_ONDISK_TO_ARGS(x)	(((x) & XFS_ATTR_ROOT ? ATTR_ROOT : 0) |\

					 ((x) & XFS_ATTR_SECURE ? ATTR_SECURE : 0))



/*

 * Alignment for namelist and valuelist entries (since they are mixed