[PATCH v4~v2 Interdiff] Introduce EROFS support

From: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
To: development@efficientek.com
Cc: grub-devel@gnu.org, dkiper@net-space.pl,
	hsiangkao@linux.alibaba.com, zhaoyifan@sjtu.edu.cn
Subject: [PATCH v4~v2 Interdiff] Introduce EROFS support
Date: Mon,  4 Mar 2024 01:17:39 +0800	[thread overview]
Message-ID: <20240303171739.801243-1-zhaoyifan@sjtu.edu.cn> (raw)
In-Reply-To: <20240303171558.800691-1-zhaoyifan@sjtu.edu.cn>

This interdiff shows the slight change between v4 and v2 for reference.

Interdiff against v2:

diff --git a/INSTALL b/INSTALL
index eb81314d1..545015ba2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -83,7 +83,7 @@ Prerequisites for make-check:
     exfat FUSE filesystem
 * The following are Debian named packages required mostly for the full
   suite of filesystem testing (but some are needed by other tests as well):
-  - btrfs-progs, dosfstools, erofs_utils, e2fsprogs, exfat-utils, f2fs-tools,
+  - btrfs-progs, dosfstools, erofs-utils, e2fsprogs, exfat-utils, f2fs-tools,
     genromfs, hfsprogs, jfsutils, nilfs-tools, ntfs-3g, reiserfsprogs,
     squashfs-tools, reiserfsprogs, udftools, xfsprogs, zfs-fuse
   - exfat-fuse, if not using the exfat kernel module
diff --git a/grub-core/fs/erofs.c b/grub-core/fs/erofs.c
index 1d44862b8..de57aaa5e 100644
--- a/grub-core/fs/erofs.c
+++ b/grub-core/fs/erofs.c
@@ -183,13 +183,7 @@ struct grub_erofs_dirent
   grub_uint8_t reserved;
 } GRUB_PACKED;
 
-enum
-{
-  BH_Meta,
-  BH_Mapped,
-};
-
-#define EROFS_MAP_MAPPED (1 << BH_Mapped)
+#define EROFS_MAP_MAPPED 0x02
 
 struct grub_erofs_map_blocks
 {
-- 
2.44.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
