Commit 779a4b60 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove XFS_DA_OP_NOTIME 



The only user of this flag sets it prior to an xfs_attr_get_ilocked
call, which doesn't update anything.  Get rid of the flag.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent f566d5b9

fs/xfs/libxfs/xfs_attr.c

+2 −3
Original line number Diff line number Diff line
@@ -365,7 +365,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->op_flags & XFS_DA_OP_NOTIME))

	if (!error)

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



	if (xfs_has_wsync(dp->i_mount))
@@ -1033,7 +1033,6 @@ xfs_attr_set( 
	if (xfs_has_wsync(mp))

		xfs_trans_set_sync(args->trans);



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

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



	/*

fs/xfs/libxfs/xfs_da_btree.h

+2 −4
Original line number Diff line number Diff line
@@ -90,9 +90,8 @@ typedef struct xfs_da_args { 
#define XFS_DA_OP_ADDNAME	(1u << 2) /* this is an add operation */

#define XFS_DA_OP_OKNOENT	(1u << 3) /* lookup op, ENOENT ok, else die */

#define XFS_DA_OP_CILOOKUP	(1u << 4) /* lookup returns CI name if found */

#define XFS_DA_OP_NOTIME	(1u << 5) /* don't update inode timestamps */

#define XFS_DA_OP_RECOVERY	(1u << 6) /* Log recovery operation */

#define XFS_DA_OP_LOGGED	(1u << 7) /* Use intent items to track op */

#define XFS_DA_OP_RECOVERY	(1u << 5) /* Log recovery operation */

#define XFS_DA_OP_LOGGED	(1u << 6) /* Use intent items to track op */



#define XFS_DA_OP_FLAGS \

	{ XFS_DA_OP_JUSTCHECK,	"JUSTCHECK" }, \
@@ -100,7 +99,6 @@ 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_RECOVERY,	"RECOVERY" }, \

	{ XFS_DA_OP_LOGGED,	"LOGGED" }

fs/xfs/scrub/attr.c

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ xchk_xattr_actor( 
	void			*priv)

{

	struct xfs_da_args		args = {

		.op_flags		= XFS_DA_OP_NOTIME,

		.attr_filter		= attr_flags & XFS_ATTR_NSP_ONDISK_MASK,

		.geo			= sc->mp->m_attr_geo,

		.whichfork		= XFS_ATTR_FORK,