You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.4 KiB
59 lines
2.4 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Eric Sandeen <sandeen@sandeen.net> |
|
Date: Tue, 15 May 2018 14:55:55 -0500 |
|
Subject: [PATCH] xfs: accept filesystem with sparse inodes |
|
|
|
The sparse inode metadata format became a mkfs.xfs default in |
|
xfsprogs-4.16.0, and such filesystems are now rejected by grub as |
|
containing an incompatible feature. |
|
|
|
In essence, this feature allows xfs to allocate inodes into fragmented |
|
freespace. (Without this feature, if xfs could not allocate contiguous |
|
space for 64 new inodes, inode creation would fail.) |
|
|
|
In practice, the disk format change is restricted to the inode btree, |
|
which as far as I can tell is not used by grub. If all you're doing |
|
today is parsing a directory, reading an inode number, and converting |
|
that inode number to a disk location, then ignoring this feature |
|
should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED |
|
|
|
I did some brief testing of this patch by hacking up the regression |
|
tests to completely fragment freespace on the test xfs filesystem, and |
|
then write a large-ish number of inodes to consume any existing |
|
contiguous 64-inode chunk. This way any files the grub tests add and |
|
traverse would be in such a fragmented inode allocation. Tests passed, |
|
but I'm not sure how to cleanly integrate that into the test harness. |
|
|
|
Signed-off-by: Eric Sandeen <sandeen@redhat.com> |
|
--- |
|
grub-core/fs/xfs.c | 16 +++++++++++++++- |
|
1 file changed, 15 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c |
|
index 72492915533..852155b1bf3 100644 |
|
--- a/grub-core/fs/xfs.c |
|
+++ b/grub-core/fs/xfs.c |
|
@@ -76,8 +76,22 @@ GRUB_MOD_LICENSE ("GPLv3+"); |
|
|
|
/* incompat feature flags */ |
|
#define XFS_SB_FEAT_INCOMPAT_FTYPE (1 << 0) /* filetype in dirent */ |
|
+#define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ |
|
+#define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ |
|
+ |
|
+/* |
|
+ * Directory entries with ftype are explicitly handled by grub code. |
|
+ * |
|
+ * We do not currently verify metadata UUID, so it is safe to read filesystems |
|
+ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. |
|
+ * |
|
+ * We do not currently read the inode btrees, so it is safe to read filesystems |
|
+ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. |
|
+ */ |
|
#define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ |
|
- (XFS_SB_FEAT_INCOMPAT_FTYPE) |
|
+ (XFS_SB_FEAT_INCOMPAT_FTYPE | \ |
|
+ XFS_SB_FEAT_INCOMPAT_SPINODES | \ |
|
+ XFS_SB_FEAT_INCOMPAT_META_UUID) |
|
|
|
struct grub_xfs_sblock |
|
{
|
|
|