Merge tag 'xfs-6.12-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (825ec756) · Commits · git / linux-net

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -25404,7 +25404,7 @@ F: include/xen/arm/swiotlb-xen.h
		F: include/xen/swiotlb-xen.h

		XFS FILESYSTEM
		M: Chandan Babu R <chandan.babu@oracle.com>
		M: Carlos Maiolino <cem@kernel.org>
		R: Darrick J. Wong <djwong@kernel.org>
		L: linux-xfs@vger.kernel.org
		S: Supported

fs/xfs/libxfs/xfs_alloc.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2766,7 +2766,6 @@ xfs_alloc_commit_autoreap(
		xfs_defer_item_unpause(tp, aarp->dfp);
		}

		#ifdef DEBUG
		/*
		* Check if an AGF has a free extent record whose length is equal to
		* args->minlen.
		@@ -2806,7 +2805,6 @@ xfs_exact_minlen_extent_available(

		return error;
		}
		#endif

		/*
		* Decide whether to use this allocation group for this allocation.
		@@ -2880,15 +2878,14 @@ xfs_alloc_fix_freelist(
		if (!xfs_alloc_space_available(args, need, alloc_flags))
		goto out_agbp_relse;

		#ifdef DEBUG
		if (args->alloc_minlen_only) {
		if (IS_ENABLED(CONFIG_XFS_DEBUG) && args->alloc_minlen_only) {
		int stat;

		error = xfs_exact_minlen_extent_available(args, agbp, &stat);
		if (error \|\| !stat)
		goto out_agbp_relse;
		}
		#endif

		/*
		* Make the freelist shorter if it's too long.
		*

fs/xfs/libxfs/xfs_alloc.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -53,11 +53,9 @@ typedef struct xfs_alloc_arg {
		int datatype; /* mask defining data type treatment */
		char wasdel; /* set if allocation was prev delayed */
		char wasfromfl; /* set if allocation is from freelist */
		bool alloc_minlen_only; /* allocate exact minlen extent */
		struct xfs_owner_info oinfo; /* owner of blocks being allocated */
		enum xfs_ag_resv_type resv; /* block reservation to use */
		#ifdef DEBUG
		bool alloc_minlen_only; /* allocate exact minlen extent */
		#endif
		} xfs_alloc_arg_t;

		/*

fs/xfs/libxfs/xfs_attr.c

+81 −109

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ STATIC int xfs_attr_shortform_addname(xfs_da_args_t *args);
		STATIC int xfs_attr_leaf_get(xfs_da_args_t *args);
		STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args);
		STATIC int xfs_attr_leaf_hasname(struct xfs_da_args args, struct xfs_buf *bp);
		STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args);

		/*
		* Internal routines when attribute list is more than one block.
		@@ -437,6 +436,33 @@ xfs_attr_hashval(
		return xfs_attr_hashname(name, namelen);
		}

		/* Save the current remote block info and clear the current pointers. */
		static void
		xfs_attr_save_rmt_blk(
		struct xfs_da_args *args)
		{
		args->blkno2 = args->blkno;
		args->index2 = args->index;
		args->rmtblkno2 = args->rmtblkno;
		args->rmtblkcnt2 = args->rmtblkcnt;
		args->rmtvaluelen2 = args->rmtvaluelen;
		args->rmtblkno = 0;
		args->rmtblkcnt = 0;
		args->rmtvaluelen = 0;
		}

		/* Set stored info about a remote block */
		static void
		xfs_attr_restore_rmt_blk(
		struct xfs_da_args *args)
		{
		args->blkno = args->blkno2;
		args->index = args->index2;
		args->rmtblkno = args->rmtblkno2;
		args->rmtblkcnt = args->rmtblkcnt2;
		args->rmtvaluelen = args->rmtvaluelen2;
		}

		/*
		* PPTR_REPLACE operations require the caller to set the old and new names and
		* values explicitly. Update the canonical fields to the new name and value
		@@ -482,48 +508,73 @@ xfs_attr_complete_op(
		return replace_state;
		}

		/*
		* Try to add an attribute to an inode in leaf form.
		*/
		static int
		xfs_attr_leaf_addname(
		struct xfs_attr_intent *attr)
		{
		struct xfs_da_args *args = attr->xattri_da_args;
		struct xfs_buf *bp;
		int error;

		ASSERT(xfs_attr_is_leaf(args->dp));

		/*
		* Use the leaf buffer we may already hold locked as a result of
		* a sf-to-leaf conversion.
		*/
		error = xfs_attr_leaf_try_add(args);

		if (error == -ENOSPC) {
		error = xfs_attr3_leaf_to_node(args);
		error = xfs_attr3_leaf_read(args->trans, args->dp, args->owner, 0, &bp);
		if (error)
		return error;

		/*
		* We're not in leaf format anymore, so roll the transaction and
		* retry the add to the newly allocated node block.
		* Look up the xattr name to set the insertion point for the new xattr.
		*/
		attr->xattri_dela_state = XFS_DAS_NODE_ADD;
		goto out;
		error = xfs_attr3_leaf_lookup_int(bp, args);
		switch (error) {
		case -ENOATTR:
		if (args->op_flags & XFS_DA_OP_REPLACE)
		goto out_brelse;
		break;
		case -EEXIST:
		if (!(args->op_flags & XFS_DA_OP_REPLACE))
		goto out_brelse;

		trace_xfs_attr_leaf_replace(args);
		/*
		* Save the existing remote attr state so that the current
		* values reflect the state of the new attribute we are about to
		* add, not the attribute we just found and will remove later.
		*/
		xfs_attr_save_rmt_blk(args);
		break;
		case 0:
		break;
		default:
		goto out_brelse;
		}
		if (error)
		return error;

		/*
		* We need to commit and roll if we need to allocate remote xattr blocks
		* or perform more xattr manipulations. Otherwise there is nothing more
		* to do and we can return success.
		*/
		if (args->rmtblkno)
		if (!xfs_attr3_leaf_add(bp, args)) {
		error = xfs_attr3_leaf_to_node(args);
		if (error)
		return error;

		attr->xattri_dela_state = XFS_DAS_NODE_ADD;
		} else if (args->rmtblkno) {
		attr->xattri_dela_state = XFS_DAS_LEAF_SET_RMT;
		else
		attr->xattri_dela_state = xfs_attr_complete_op(attr,
		XFS_DAS_LEAF_REPLACE);
		out:
		} else {
		attr->xattri_dela_state =
		xfs_attr_complete_op(attr, XFS_DAS_LEAF_REPLACE);
		}

		trace_xfs_attr_leaf_addname_return(attr->xattri_dela_state, args->dp);
		return 0;

		out_brelse:
		xfs_trans_brelse(args->trans, bp);
		return error;
		}

		@@ -546,7 +597,7 @@ xfs_attr_node_addname(
		return error;

		error = xfs_attr_node_try_addname(attr);
		if (error == -ENOSPC) {
		if (error == 1) {
		error = xfs_attr3_leaf_to_node(args);
		if (error)
		return error;
		@@ -1170,88 +1221,6 @@ xfs_attr_shortform_addname(
		* External routines when attribute list is one block
		========================================================================/

		/* Save the current remote block info and clear the current pointers. */
		static void
		xfs_attr_save_rmt_blk(
		struct xfs_da_args *args)
		{
		args->blkno2 = args->blkno;
		args->index2 = args->index;
		args->rmtblkno2 = args->rmtblkno;
		args->rmtblkcnt2 = args->rmtblkcnt;
		args->rmtvaluelen2 = args->rmtvaluelen;
		args->rmtblkno = 0;
		args->rmtblkcnt = 0;
		args->rmtvaluelen = 0;
		}

		/* Set stored info about a remote block */
		static void
		xfs_attr_restore_rmt_blk(
		struct xfs_da_args *args)
		{
		args->blkno = args->blkno2;
		args->index = args->index2;
		args->rmtblkno = args->rmtblkno2;
		args->rmtblkcnt = args->rmtblkcnt2;
		args->rmtvaluelen = args->rmtvaluelen2;
		}

		/*
		* Tries to add an attribute to an inode in leaf form
		*
		* This function is meant to execute as part of a delayed operation and leaves
		* the transaction handling to the caller. On success the attribute is added
		* and the inode and transaction are left dirty. If there is not enough space,
		* the attr data is converted to node format and -ENOSPC is returned. Caller is
		* responsible for handling the dirty inode and transaction or adding the attr
		* in node format.
		*/
		STATIC int
		xfs_attr_leaf_try_add(
		struct xfs_da_args *args)
		{
		struct xfs_buf *bp;
		int error;

		error = xfs_attr3_leaf_read(args->trans, args->dp, args->owner, 0, &bp);
		if (error)
		return error;

		/*
		* Look up the xattr name to set the insertion point for the new xattr.
		*/
		error = xfs_attr3_leaf_lookup_int(bp, args);
		switch (error) {
		case -ENOATTR:
		if (args->op_flags & XFS_DA_OP_REPLACE)
		goto out_brelse;
		break;
		case -EEXIST:
		if (!(args->op_flags & XFS_DA_OP_REPLACE))
		goto out_brelse;

		trace_xfs_attr_leaf_replace(args);
		/*
		* Save the existing remote attr state so that the current
		* values reflect the state of the new attribute we are about to
		* add, not the attribute we just found and will remove later.
		*/
		xfs_attr_save_rmt_blk(args);
		break;
		case 0:
		break;
		default:
		goto out_brelse;
		}

		return xfs_attr3_leaf_add(bp, args);

		out_brelse:
		xfs_trans_brelse(args->trans, bp);
		return error;
		}

		/*
		* Return EEXIST if attr is found, or ENOATTR if not
		*/
		@@ -1417,9 +1386,12 @@ xfs_attr_node_addname_find_attr(
		/*
		* Add a name to a Btree-format attribute list.
		*
		* This will involve walking down the Btree, and may involve splitting
		* leaf nodes and even splitting intermediate nodes up to and including
		* the root node (a special case of an intermediate node).
		* This will involve walking down the Btree, and may involve splitting leaf
		* nodes and even splitting intermediate nodes up to and including the root
		* node (a special case of an intermediate node).
		*
		* If the tree was still in single leaf format and needs to converted to
		* real node format return 1 and let the caller handle that.
		*/
		static int
		xfs_attr_node_try_addname(
		@@ -1427,21 +1399,21 @@ xfs_attr_node_try_addname(
		{
		struct xfs_da_state *state = attr->xattri_da_state;
		struct xfs_da_state_blk *blk;
		int error;
		int error = 0;

		trace_xfs_attr_node_addname(state->args);

		blk = &state->path.blk[state->path.active-1];
		ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);

		error = xfs_attr3_leaf_add(blk->bp, state->args);
		if (error == -ENOSPC) {
		if (!xfs_attr3_leaf_add(blk->bp, state->args)) {
		if (state->path.active == 1) {
		/*
		* Its really a single leaf node, but it had
		* out-of-line values so it looked like it might
		* have been a b-tree. Let the caller deal with this.
		*/
		error = 1;
		goto out;
		}

fs/xfs/libxfs/xfs_attr_leaf.c

+22 −18

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@
		*/
		STATIC int xfs_attr3_leaf_create(struct xfs_da_args *args,
		xfs_dablk_t which_block, struct xfs_buf **bpp);
		STATIC int xfs_attr3_leaf_add_work(struct xfs_buf *leaf_buffer,
		STATIC void xfs_attr3_leaf_add_work(struct xfs_buf *leaf_buffer,
		struct xfs_attr3_icleaf_hdr *ichdr,
		struct xfs_da_args *args, int freemap_index);
		STATIC void xfs_attr3_leaf_compact(struct xfs_da_args *args,
		@@ -995,10 +995,8 @@ xfs_attr_shortform_to_leaf(
		xfs_attr_sethash(&nargs);
		error = xfs_attr3_leaf_lookup_int(bp, &nargs); /* set a->index */
		ASSERT(error == -ENOATTR);
		error = xfs_attr3_leaf_add(bp, &nargs);
		ASSERT(error != -ENOSPC);
		if (error)
		goto out;
		if (!xfs_attr3_leaf_add(bp, &nargs))
		ASSERT(0);
		sfe = xfs_attr_sf_nextentry(sfe);
		}
		error = 0;
		@@ -1333,6 +1331,9 @@ xfs_attr3_leaf_create(

		/*
		* Split the leaf node, rebalance, then add the new entry.
		*
		* Returns 0 if the entry was added, 1 if a further split is needed or a
		* negative error number otherwise.
		*/
		int
		xfs_attr3_leaf_split(
		@@ -1340,6 +1341,7 @@ xfs_attr3_leaf_split(
		struct xfs_da_state_blk *oldblk,
		struct xfs_da_state_blk *newblk)
		{
		bool added;
		xfs_dablk_t blkno;
		int error;

		@@ -1376,10 +1378,10 @@ xfs_attr3_leaf_split(
		*/
		if (state->inleaf) {
		trace_xfs_attr_leaf_add_old(state->args);
		error = xfs_attr3_leaf_add(oldblk->bp, state->args);
		added = xfs_attr3_leaf_add(oldblk->bp, state->args);
		} else {
		trace_xfs_attr_leaf_add_new(state->args);
		error = xfs_attr3_leaf_add(newblk->bp, state->args);
		added = xfs_attr3_leaf_add(newblk->bp, state->args);
		}

		/*
		@@ -1387,13 +1389,15 @@ xfs_attr3_leaf_split(
		*/
		oldblk->hashval = xfs_attr_leaf_lasthash(oldblk->bp, NULL);
		newblk->hashval = xfs_attr_leaf_lasthash(newblk->bp, NULL);
		return error;
		if (!added)
		return 1;
		return 0;
		}

		/*
		* Add a name to the leaf attribute list structure.
		*/
		int
		bool
		xfs_attr3_leaf_add(
		struct xfs_buf *bp,
		struct xfs_da_args *args)
		@@ -1402,6 +1406,7 @@ xfs_attr3_leaf_add(
		struct xfs_attr3_icleaf_hdr ichdr;
		int tablesize;
		int entsize;
		bool added = true;
		int sum;
		int tmp;
		int i;
		@@ -1430,7 +1435,7 @@ xfs_attr3_leaf_add(
		if (ichdr.freemap[i].base < ichdr.firstused)
		tmp += sizeof(xfs_attr_leaf_entry_t);
		if (ichdr.freemap[i].size >= tmp) {
		tmp = xfs_attr3_leaf_add_work(bp, &ichdr, args, i);
		xfs_attr3_leaf_add_work(bp, &ichdr, args, i);
		goto out_log_hdr;
		}
		sum += ichdr.freemap[i].size;
		@@ -1442,7 +1447,7 @@ xfs_attr3_leaf_add(
		* no good and we should just give up.
		*/
		if (!ichdr.holes && sum < entsize)
		return -ENOSPC;
		return false;

		/*
		* Compact the entries to coalesce free space.
		@@ -1455,24 +1460,24 @@ xfs_attr3_leaf_add(
		* free region, in freemap[0]. If it is not big enough, give up.
		*/
		if (ichdr.freemap[0].size < (entsize + sizeof(xfs_attr_leaf_entry_t))) {
		tmp = -ENOSPC;
		added = false;
		goto out_log_hdr;
		}

		tmp = xfs_attr3_leaf_add_work(bp, &ichdr, args, 0);
		xfs_attr3_leaf_add_work(bp, &ichdr, args, 0);

		out_log_hdr:
		xfs_attr3_leaf_hdr_to_disk(args->geo, leaf, &ichdr);
		xfs_trans_log_buf(args->trans, bp,
		XFS_DA_LOGRANGE(leaf, &leaf->hdr,
		xfs_attr3_leaf_hdr_size(leaf)));
		return tmp;
		return added;
		}

		/*
		* Add a name to a leaf attribute list structure.
		*/
		STATIC int
		STATIC void
		xfs_attr3_leaf_add_work(
		struct xfs_buf *bp,
		struct xfs_attr3_icleaf_hdr *ichdr,
		@@ -1590,7 +1595,6 @@ xfs_attr3_leaf_add_work(
		}
		}
		ichdr->usedbytes += xfs_attr_leaf_entsize(leaf, args->index);
		return 0;
		}

		/*