[GIT PULL 2/4] xfs: fix problems in the attr leaf freemap code

[GIT PULL 2/4] xfs: fix problems in the attr leaf freemap code

[Darrick J. Wong]

Hi Carlos,

Please pull this branch with changes for xfs for 7.0-rc1.

As usual, I did a test-merge with the main upstream branch as of a few
minutes ago, and didn't see any conflicts.  Please let me know if you
encounter any problems.

--D

The following changes since commit a1ca658d649a4d8972e2e21ac2625b633217e327:

xfs: fix incorrect context handling in xfs_trans_roll (2026-01-21 12:59:10 +0100)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/attr-leaf-freemap-fixes-7.0_2026-01-25

for you to fetch changes up to bd3138e8912c9db182eac5fed1337645a98b7a4f:

xfs: fix remote xattr valuelblk check (2026-01-23 09:27:33 -0800)

----------------------------------------------------------------
xfs: fix problems in the attr leaf freemap code [1/3]

Running generic/753 for hours revealed data corruption problems in the
attr leaf block space management code.  Under certain circumstances,
freemap entries are left with zero size but a nonzero offset.  If that
offset happens to be the same offset as the end of the entries array
during an attr set operation, the leaf entry table expansion will push
the freemap record offset upwards without checking for overlap with any
other freemap entries.  If there happened to be a second freemap entry
overlapping with the newly allocated leaf entry space, then the next
attr set operation might find that space and overwrite the leaf entry,
thereby corrupting the leaf block.

Fix this by zeroing the freemap offset any time we set the size to zero.
If a subsequent attr set operation finds no space in the freemap, it
will compact the block and regenerate the freemaps.

With a bit of luck, this should all go splendidly.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>

----------------------------------------------------------------
Darrick J. Wong (6):
xfs: delete attr leaf freemap entries when empty
xfs: fix freemap adjustments when adding xattrs to leaf blocks
xfs: refactor attr3 leaf table size computation
xfs: strengthen attr leaf block freemap checking
xfs: fix the xattr scrub to detect freemap/entries array collisions
xfs: fix remote xattr valuelblk check

fs/xfs/libxfs/xfs_da_format.h |   2 +-
fs/xfs/libxfs/xfs_attr_leaf.c | 157 +++++++++++++++++++++++++++++++++---------
fs/xfs/scrub/attr.c           |  59 ++++++++--------
3 files changed, 155 insertions(+), 63 deletions(-)

Re: [GIT PULL 2/4] xfs: fix problems in the attr leaf freemap code

[Carlos Maiolino]

On Sun, 25 Jan 2026 23:21:56 -0800, Darrick J. Wong wrote:
> Please pull this branch with changes for xfs for 7.0-rc1.
> 
> As usual, I did a test-merge with the main upstream branch as of a few
> minutes ago, and didn't see any conflicts.  Please let me know if you
> encounter any problems.
> 
> --D
> 
> [...]

Merged, thanks!

merge commit: 1ef7729df1f0c5f7bb63a121164f54d376d35835

Best regards,
-- 
Carlos Maiolino <cem@kernel.org>