tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs/xfs: Fix large extent counters incompat feature support

Browse Source 
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 commit 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 <sandeen@redhat.com>
Reviewed-by: Anthony Iliopoulos <ailiop@suse.com>
Reviewed-by: Jon DeVree <nuxi@vault24.org>
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Eric Sandeen 2024-12-04 07:50:28 -06:00 committed by Daniel Kiper
parent a4da71dafe
commit 4abac0ad5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub-core/fs/xfs.c
View File

@ -971,7 +971,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
* Leaf and tail information are only in the data block if the number * Leaf and tail information are only in the data block if the number
* of extents is 1. * of extents is 1.
*/ */
if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1)) if (grub_xfs_get_inode_nextents (&dir->inode) == 1)
{ {
struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock); struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock);
@ -1028,7 +1028,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
* The expected number of directory entries is only tracked for the * The expected number of directory entries is only tracked for the
* single extent case. * 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. */ /* Check if last direntry in this block is reached. */
entries--; entries--;