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

xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME 



op_flags with the XFS_DA_OP_* flags is the usual place for in-kernel
only flags, so move the notime flag there.

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 d49db18b

fs/xfs/libxfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ xfs_attr_try_sf_addname( 
	 * Commit the shortform mods, and we're done.

	 * NOTE: this is also the error path (EEXIST, etc).

	 */

	if (!error && (args->flags & ATTR_KERNOTIME) == 0)

	if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))

		xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);



	if (mp->m_flags & XFS_MOUNT_WSYNC)
@@ -389,7 +389,7 @@ xfs_attr_set( 
	if (mp->m_flags & XFS_MOUNT_WSYNC)

		xfs_trans_set_sync(args->trans);



	if ((args->flags & ATTR_KERNOTIME) == 0)

	if (!(args->op_flags & XFS_DA_OP_NOTIME))

		xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);



	/*

fs/xfs/libxfs/xfs_attr.h

+1 −7
Original line number Diff line number Diff line
@@ -33,19 +33,13 @@ struct xfs_attr_list_context; 
#define ATTR_CREATE	0x0010	/* pure create: fail if attr already exists */

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



#define ATTR_KERNOTIME	0x1000	/* [kernel] don't update inode timestamps */



#define ATTR_KERNEL_FLAGS \

	(ATTR_KERNOTIME)



#define XFS_ATTR_FLAGS \

	{ ATTR_DONTFOLLOW, 	"DONTFOLLOW" }, \

	{ ATTR_ROOT,		"ROOT" }, \

	{ ATTR_TRUST,		"TRUST" }, \

	{ ATTR_SECURE,		"SECURE" }, \

	{ ATTR_CREATE,		"CREATE" }, \

	{ ATTR_REPLACE,		"REPLACE" }, \

	{ ATTR_KERNOTIME,	"KERNOTIME" }

	{ ATTR_REPLACE,		"REPLACE" }



/*

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

fs/xfs/libxfs/xfs_da_btree.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ typedef struct xfs_da_args { 
#define XFS_DA_OP_ADDNAME	0x0004	/* this is an add operation */

#define XFS_DA_OP_OKNOENT	0x0008	/* lookup/add op, ENOENT ok, else die */

#define XFS_DA_OP_CILOOKUP	0x0010	/* lookup to return CI name if found */

#define XFS_DA_OP_NOTIME	0x0020	/* don't update inode timestamps */

#define XFS_DA_OP_INCOMPLETE	0x0040	/* lookup INCOMPLETE attr keys */



#define XFS_DA_OP_FLAGS \
@@ -96,6 +97,7 @@ typedef struct xfs_da_args { 
	{ XFS_DA_OP_ADDNAME,	"ADDNAME" }, \

	{ XFS_DA_OP_OKNOENT,	"OKNOENT" }, \

	{ XFS_DA_OP_CILOOKUP,	"CILOOKUP" }, \

	{ XFS_DA_OP_NOTIME,	"NOTIME" }, \

	{ XFS_DA_OP_INCOMPLETE,	"INCOMPLETE" }



/*

fs/xfs/scrub/attr.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ xchk_xattr_listent( 
		return;

	}



	args.flags = ATTR_KERNOTIME;

	args.op_flags = XFS_DA_OP_NOTIME;

	if (flags & XFS_ATTR_ROOT)

		args.flags |= ATTR_ROOT;

	else if (flags & XFS_ATTR_SECURE)

fs/xfs/xfs_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ xfs_ioc_attrmulti_one( 


	if ((flags & ATTR_ROOT) && (flags & ATTR_SECURE))

		return -EINVAL;

	flags &= ~ATTR_KERNEL_FLAGS;



	name = strndup_user(uname, MAXNAMELEN);

	if (IS_ERR(name))