[arch-commits] Commit in grub/trunk (2 files)

[Christian Hesse]

    Date: Monday, June 18, 2018 @ 05:56:02
  Author: eworm
Revision: 327114

upgpkg: grub 2:2.02-6

xfs: Accept filesystem with sparse inodes (FS#59047)

Added:
  grub/trunk/0009-xfs-Accept-filesystem-with-sparse-inodes.patch
Modified:
  grub/trunk/PKGBUILD

-----------------------------------------------------+
 0009-xfs-Accept-filesystem-with-sparse-inodes.patch |   60 ++++++++++++++++++
 PKGBUILD                                            |    7 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

Added: 0009-xfs-Accept-filesystem-with-sparse-inodes.patch
===================================================================
--- 0009-xfs-Accept-filesystem-with-sparse-inodes.patch	                        (rev 0)
+++ 0009-xfs-Accept-filesystem-with-sparse-inodes.patch	2018-06-18 05:56:02 UTC (rev 327114)
@@ -0,0 +1,60 @@
+From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
+From: Daniel Kiper <daniel.kiper at oracle.com>
+Date: Tue, 29 May 2018 16:16:02 +0200
+Subject: 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 at redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper at oracle.com>
+Tested-by: Chris Murphy <lists at colorremedies.com>
+---
+ grub-core/fs/xfs.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index c6031bd..3b00c74 100644
+--- a/grub-core/fs/xfs.c
++++ b/grub-core/fs/xfs.c
+@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define XFS_SB_FEAT_INCOMPAT_SPINODES   (1 << 1)        /* sparse inode chunks */
+ #define XFS_SB_FEAT_INCOMPAT_META_UUID  (1 << 2)        /* metadata UUID */
+ 
+-/* We do not currently verify metadata UUID so it is safe to read such filesystem */
++/*
++ * Directory entries with ftype are explicitly handled by GRUB code.
++ *
++ * We do not currently read the inode btrees, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature.
++ *
++ * We do not currently verify metadata UUID, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
++ */
+ #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
+ 	(XFS_SB_FEAT_INCOMPAT_FTYPE | \
++	 XFS_SB_FEAT_INCOMPAT_SPINODES | \
+ 	 XFS_SB_FEAT_INCOMPAT_META_UUID)
+ 
+ struct grub_xfs_sblock
+-- 
+cgit v1.0-41-gc330
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-18 04:33:58 UTC (rev 327113)
+++ PKGBUILD	2018-06-18 05:56:02 UTC (rev 327114)
@@ -22,7 +22,7 @@
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2)"
 pkgver=2.02
-pkgrel=5
+pkgrel=6
 epoch=2
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64')
@@ -66,6 +66,7 @@
         '0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch'
         '0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch'
         '0008-Fix-packed-not-aligned-error-on-GCC-8.patch'
+        '0009-xfs-Accept-filesystem-with-sparse-inodes.patch'
         'grub.default'
         'grub.cfg')
 
@@ -80,6 +81,7 @@
             'c38f2b2caae33008b35a37d8293d8bf13bf6fd779a4504925da1837fd007aeb5'
             'e43566c4fe3b1b87e677167323d4716b82ac0810410a9d8dc7fbf415c8db2b8a'
             'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8'
+            'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87'
             '74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
             'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
 
@@ -109,6 +111,9 @@
 	msg "Fix packed-not-aligned error on GCC 8"
 	patch -Np1 -i "${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"
 
+	msg "xfs: Accept filesystem with sparse inodes"
+	patch -Np1 -i "${srcdir}/0009-xfs-Accept-filesystem-with-sparse-inodes.patch"
+
 	msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"