From 846b1d8bebd316a18fae9fb90efb3e8451ec70cc Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 4 Dec 2024 07:50:28 -0600 Subject: [PATCH 3/3] fs/xfs: fix large extent counters incompat feature support When large extent counter / NREXT64 support was added to grub, it missed a couple of direct reads of nextents which need to be changed to the new NREXT64-aware helper as well. Without this, we'll have mis-reads of some directories with this feature enabled. (The large extent counter fix likely raced on merge with 07318ee7e ("fs/xfs: Fix XFS directory extent parsing") which added the new direct nextents reads just prior, causing this issue.) Fixes: aa7c1322671e ("fs/xfs: Add large extent counters incompat feature support") Signed-off-by: Eric Sandeen Reviewed-by: Anthony Iliopoulos Reviewed-by: Jon DeVree Link: https://lore.kernel.org/r/985816b8-35e6-4083-994f-ec9138bd35d2@redhat.com --- grub-core/fs/xfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c index 30e3e7f6d9..3ba232436e 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c @@ -937,7 +937,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, * Leaf and tail information are only in the data block if the number * of extents is 1. */ - if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1)) + if (grub_xfs_get_inode_nextents(&dir->inode) == 1) { end = (char *) tail; @@ -992,7 +992,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, * The expected number of directory entries is only tracked for the * single extent case. */ - if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1)) + if (grub_xfs_get_inode_nextents(&dir->inode) == 1) { /* Check if last direntry in this block is reached. */ entries--; -- 2.48.1