Attachment 872053 Details for Bug 1218864

[patch] check-expected-entry.diff

check-expected-entry.diff (text/plain), 1.21 KB, created by Michael Chang on 2024-01-22 07:42:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Chang

Created: 2024-01-22 07:42:52 UTC

Size: 1.21 KB

patch

obsolete

>diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
>index bc2224dbb..1ce5fa4fc 100644
>--- a/grub-core/fs/xfs.c
>+++ b/grub-core/fs/xfs.c
>@@ -900,6 +900,8 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
> 	  {
> 	    struct grub_xfs_dir2_entry *direntry =
> 					grub_xfs_first_de(dir->data, dirblock);
>+	    struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock);
>+
> 	    int entries = -1;
> 	    char *end = dirblock + dirblk_size;
> 
>@@ -918,18 +920,16 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,
> 	     */
> 	    if (dir->inode.nextents == grub_cpu_to_be32_compile_time (1))
> 	      {
>-		struct grub_xfs_dirblock_tail *tail = grub_xfs_dir_tail (dir->data, dirblock);
>-
> 		end = (char *) tail;
> 
> 		/* Subtract the space used by leaf nodes. */
> 		end -= grub_be_to_cpu32 (tail->leaf_count) * sizeof (struct grub_xfs_dir_leaf_entry);
>+	      }
> 
>-		entries = grub_be_to_cpu32 (tail->leaf_count) - grub_be_to_cpu32 (tail->leaf_stale);
>+	    entries = grub_be_to_cpu32 (tail->leaf_count) - grub_be_to_cpu32 (tail->leaf_stale);
> 
>-		if (!entries)
>-		  continue;
>-	      }
>+	    if (!entries)
>+	      continue;
> 
> 	    /* Iterate over all entries within this block.  */
> 	    while ((char *) direntry < (char *) end)

Actions: View | Diff

Attachments on bug 1218864: 871939 | 871940 | 871941 | 871943 | 871944 | 871945 | 871946 | 872050 | 872053