Commit 063232b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.19-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "There's not a whole lot this time around (I'm still on vacation) but
  here are some important fixes for new features merged in -rc1:

   - Fix a bug where inode flag changes would accidentally drop nrext64

   - Fix a race condition when toggling LARP mode"

* tag 'xfs-5.19-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: preserve DIFLAG2_NREXT64 when setting other inode attributes
  xfs: fix variable state usage
  xfs: fix TOCTOU race involving the new logged xattrs control knob
parents 354c6e07 e89ab76d

fs/xfs/libxfs/xfs_attr.c

+5 −4
Original line number Diff line number Diff line
@@ -997,9 +997,11 @@ xfs_attr_set( 
	/*

	 * We have no control over the attribute names that userspace passes us

	 * to remove, so we have to allow the name lookup prior to attribute

	 * removal to fail as well.

	 * removal to fail as well.  Preserve the logged flag, since we need

	 * to pass that through to the logging code.

	 */

	args->op_flags = XFS_DA_OP_OKNOENT;

	args->op_flags = XFS_DA_OP_OKNOENT |

					(args->op_flags & XFS_DA_OP_LOGGED);



	if (args->value) {

		XFS_STATS_INC(mp, xs_attr_set);
@@ -1439,12 +1441,11 @@ static int 
xfs_attr_node_try_addname(

	struct xfs_attr_intent		*attr)

{

	struct xfs_da_args		*args = attr->xattri_da_args;

	struct xfs_da_state		*state = attr->xattri_da_state;

	struct xfs_da_state_blk		*blk;

	int				error;



	trace_xfs_attr_node_addname(args);

	trace_xfs_attr_node_addname(state->args);



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

	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

fs/xfs/libxfs/xfs_attr.h

+1 −11
Original line number Diff line number Diff line
@@ -28,16 +28,6 @@ struct xfs_attr_list_context; 
 */

#define	ATTR_MAX_VALUELEN	(64*1024)	/* max length of a value */



static inline bool xfs_has_larp(struct xfs_mount *mp)

{

#ifdef DEBUG

	/* Logged xattrs require a V5 super for log_incompat */

	return xfs_has_crc(mp) && xfs_globals.larp;

#else

	return false;

#endif

}



/*

 * Kernel-internal version of the attrlist cursor.

 */
@@ -624,7 +614,7 @@ static inline enum xfs_delattr_state 
xfs_attr_init_replace_state(struct xfs_da_args *args)

{

	args->op_flags |= XFS_DA_OP_ADDNAME | XFS_DA_OP_REPLACE;

	if (xfs_has_larp(args->dp->i_mount))

	if (args->op_flags & XFS_DA_OP_LOGGED)

		return xfs_attr_init_remove_state(args);

	return xfs_attr_init_add_state(args);

}

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ xfs_attr3_leaf_add_work( 
	if (tmp)

		entry->flags |= XFS_ATTR_LOCAL;

	if (args->op_flags & XFS_DA_OP_REPLACE) {

		if (!xfs_has_larp(mp))

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

			entry->flags |= XFS_ATTR_INCOMPLETE;

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

		    (args->index2 <= args->index)) {

fs/xfs/libxfs/xfs_da_btree.h

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ typedef struct xfs_da_args { 
#define XFS_DA_OP_NOTIME	(1u << 5) /* don't update inode timestamps */

#define XFS_DA_OP_REMOVE	(1u << 6) /* this is a remove operation */

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

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



#define XFS_DA_OP_FLAGS \

	{ XFS_DA_OP_JUSTCHECK,	"JUSTCHECK" }, \
@@ -101,7 +102,8 @@ typedef struct xfs_da_args { 
	{ XFS_DA_OP_CILOOKUP,	"CILOOKUP" }, \

	{ XFS_DA_OP_NOTIME,	"NOTIME" }, \

	{ XFS_DA_OP_REMOVE,	"REMOVE" }, \

	{ XFS_DA_OP_RECOVERY,	"RECOVERY" }

	{ XFS_DA_OP_RECOVERY,	"RECOVERY" }, \

	{ XFS_DA_OP_LOGGED,	"LOGGED" }



/*

 * Storage for holding state during Btree searches and split/join ops.

fs/xfs/xfs_attr_item.c

+9 −6
Original line number Diff line number Diff line
@@ -413,18 +413,20 @@ xfs_attr_create_intent( 
	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_attri_log_item	*attrip;

	struct xfs_attr_intent		*attr;

	struct xfs_da_args		*args;



	ASSERT(count == 1);



	if (!xfs_sb_version_haslogxattrs(&mp->m_sb))

		return NULL;



	/*

	 * Each attr item only performs one attribute operation at a time, so

	 * this is a list of one

	 */

	attr = list_first_entry_or_null(items, struct xfs_attr_intent,

			xattri_list);

	args = attr->xattri_da_args;



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

		return NULL;



	/*

	 * Create a buffer to store the attribute name and value.  This buffer
@@ -432,8 +434,6 @@ xfs_attr_create_intent( 
	 * and the lower level xattr log items.

	 */

	if (!attr->xattri_nameval) {

		struct xfs_da_args	*args = attr->xattri_da_args;



		/*

		 * Transfer our reference to the name/value buffer to the

		 * deferred work state structure.
@@ -617,7 +617,10 @@ xfs_attri_item_recover( 
	args->namelen = nv->name.i_len;

	args->hashval = xfs_da_hashname(args->name, args->namelen);

	args->attr_filter = attrp->alfi_attr_filter & XFS_ATTRI_FILTER_MASK;

	args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT;

	args->op_flags = XFS_DA_OP_RECOVERY | XFS_DA_OP_OKNOENT |

			 XFS_DA_OP_LOGGED;



	ASSERT(xfs_sb_version_haslogxattrs(&mp->m_sb));



	switch (attr->xattri_op_flags) {

	case XFS_ATTRI_OP_FLAGS_SET: