FAILED: patch "[PATCH] xfs: initialise args->total for parent pointer updates" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 8e4ebb6afaa34bd2e8ce52da231003d24111c2d6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026091609-these-relocate-53bf@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8e4ebb6afaa34bd2e8ce52da231003d24111c2d6 Mon Sep 17 00:00:00 2001
From: Javier Tia <[email protected]>
Date: Mon, 10 Aug 2026 17:06:17 -0600
Subject: [PATCH] xfs: initialise args->total for parent pointer updates
xfs_parent_da_args_init() builds an xfs_da_args from a zeroed xfs_parent_args (kmem_cache_zalloc), leaving args->total == 0. xfs_da_grow_inode_int() treats that field as a running block reservation and subtracts from it; because it is an xfs_extlen_t (uint32_t), the first attr-fork growth wraps it to ~0U. That defeats the free-space check in xfs_alloc_space_available(), and when it coincides with an AG that has exactly zero available blocks the allocation is clamped to maxlen 0 and returns -ENOSPC, which xfs_defer_finish_noroll() escalates to a filesystem shutdown.
Set args->total the way the log recovery path does (xfs_attri_recover_work(), xfs_attr_item.c:706), in the add and replace paths that can grow the fork. Removals and lookups never grow it, so they leave the field alone, matching that switch.
fs/xfs/libxfs/xfs_parent.c +10 -2
@@ -193,7 +193,7 @@ xfs_parent_addname(const struct xfs_name *parent_name, struct xfs_inode *child) { - int error; + int error, local; error =xfs_parent_iread_extents (tp, child);if (error)
@@ -203,6 +203,10 @@ xfs_parent_addname(xfs_parent_da_args_init (&ppargs->args, tp, &ppargs->rec, child,I_INO (child), parent_name); +/* Growing the attr fork needs a real reservation in args->total. */ + ppargs->args.total =xfs_attr_calc_size (&ppargs->args, &local); +ASSERT (local); +return xfs_attr_setname (&ppargs->args,0 ); }
@@ -239,7 +243,7 @@ xfs_parent_replacename(const struct xfs_name *new_name, struct xfs_inode *child) { - int error; + int error, local; error =xfs_parent_iread_extents (tp, child);if (error)
@@ -249,6 +253,10 @@ xfs_parent_replacename(xfs_parent_da_args_init (&ppargs->args, tp, &ppargs->rec, child,I_INO (child), old_name); +/* Growing the attr fork needs a real reservation in args->total. */ + ppargs->args.total =xfs_attr_calc_size (&ppargs->args, &local); +ASSERT (local); +xfs_inode_to_parent_rec (&ppargs->new_rec, new_dp); ppargs->args.new_name = new_name->name;
PATCH 1/1 xfs: initialise args->total for parent pointer updates
commit 8e4ebb6afaa34bd2e8ce52da231003d24111c2d6 upstream.
xfs_parent_da_args_init() builds an xfs_da_args from a zeroed xfs_parent_args (kmem_cache_zalloc), leaving args->total == 0. xfs_da_grow_inode_int() treats that field as a running block reservation and subtracts from it; because it is an xfs_extlen_t (uint32_t), the first attr-fork growth wraps it to ~0U. That defeats the free-space check in xfs_alloc_space_available(), and when it coincides with an AG that has exactly zero available blocks the allocation is clamped to maxlen 0 and returns -ENOSPC, which xfs_defer_finish_noroll() escalates to a filesystem shutdown.
Set args->total the way the log recovery path does (xfs_attri_recover_work(), xfs_attr_item.c:706), in the add and replace paths that can grow the fork. Removals and lookups never grow it, so they leave the field alone, matching that switch.
[ Backported to 6.12.y and 6.18.y, whose fs/xfs/libxfs/xfs_parent.c are
byte-identical. These trees queue the operation with xfs_attr_defer_add() instead of calling xfs_attr_setname() and xfs_attr_replacename() directly, and spell the inode number child->i_ino rather than I_INO(child), so the upstream hunks do not apply as-is. The defect is unchanged: xfs_attr_defer_add() stores a pointer to this same xfs_da_args, and xfs_attr_finish_item() resets only args->trans, so the zeroed total still reaches xfs_da_grow_inode_int(). The assignment therefore goes in the same place, before the operation is queued. xfs_attr_calc_size() needs no new include: it is declared in xfs_attr.h, which xfs_parent.c already includes. ]
--- fs/xfs/libxfs/xfs_parent.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_parent.c +11 -2
@@ -193,7 +193,7 @@ xfs_parent_addname(const struct xfs_name *parent_name, struct xfs_inode *child) { - int error; + int error, local; error =xfs_parent_iread_extents (tp, child);if (error)
@@ -202,6 +202,11 @@ xfs_parent_addname(xfs_inode_to_parent_rec (&ppargs->rec, dp);xfs_parent_da_args_init (&ppargs->args, tp, &ppargs->rec, child, child->i_ino, parent_name); + +/* Growing the attr fork needs a real reservation in args->total. */ + ppargs->args.total =xfs_attr_calc_size (&ppargs->args, &local); +ASSERT (local); +xfs_attr_defer_add (&ppargs->args,XFS_ATTR_DEFER_SET );return 0 ; }
@@ -239,7 +244,7 @@ xfs_parent_replacename(const struct xfs_name *new_name, struct xfs_inode *child) { - int error; + int error, local; error =xfs_parent_iread_extents (tp, child);if (error)
@@ -249,6 +254,10 @@ xfs_parent_replacename(xfs_parent_da_args_init (&ppargs->args, tp, &ppargs->rec, child, child->i_ino, old_name); +/* Growing the attr fork needs a real reservation in args->total. */ + ppargs->args.total =xfs_attr_calc_size (&ppargs->args, &local); +ASSERT (local); +xfs_inode_to_parent_rec (&ppargs->new_rec, new_dp); ppargs->args.new_name = new_name->name; ppargs->args.new_namelen = new_name->len;
---
base-commit: 833291ee77846538926c990bcb468f6f54e9af50
change-id: 20260916-backport-pptr-total-612-b2776c2ffb71
Best regards,
Signature · 1 line
Javier Tia <[email protected]>