52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 2c74cdb28bad7e8122bfd51a6d4897f792ef3e2f Mon Sep 17 00:00:00 2001
|
|
From: cpackham-atlnz <85916201+cpackham-atlnz@users.noreply.github.com>
|
|
Date: Tue, 12 Mar 2024 00:55:36 +1300
|
|
Subject: [PATCH] basic: add PIDFS magic (#31709)
|
|
|
|
Kernel commit cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b added pidfs.
|
|
Update filesystems-gperf.gperf and missing_magic.h accordingly.
|
|
|
|
This fixes the following error building against a bleeding edge kernel.
|
|
```
|
|
../src/basic/meson.build:234:8: ERROR: Problem encountered: Unknown filesystems defined in kernel headers:
|
|
|
|
Filesystem found in kernel header but not in filesystems-gperf.gperf: PID_FS_MAGIC
|
|
```
|
|
|
|
(cherry picked from commit ed01b92e1c92871bbd92711f280e2b2d15753f0e)
|
|
|
|
Resolves: RHEL-114974
|
|
---
|
|
src/basic/filesystems-gperf.gperf | 1 +
|
|
src/basic/missing_magic.h | 5 +++++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf
|
|
index e8c5357f91..1cd66b5a5f 100644
|
|
--- a/src/basic/filesystems-gperf.gperf
|
|
+++ b/src/basic/filesystems-gperf.gperf
|
|
@@ -91,6 +91,7 @@ ocfs2, {OCFS2_SUPER_MAGIC}
|
|
openpromfs, {OPENPROM_SUPER_MAGIC}
|
|
orangefs, {ORANGEFS_DEVREQ_MAGIC}
|
|
overlay, {OVERLAYFS_SUPER_MAGIC}
|
|
+pidfs, {PID_FS_MAGIC}
|
|
pipefs, {PIPEFS_MAGIC}
|
|
ppc-cmm, {PPC_CMM_MAGIC}
|
|
proc, {PROC_SUPER_MAGIC}
|
|
diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
|
|
index c104fcfba3..82ede1873e 100644
|
|
--- a/src/basic/missing_magic.h
|
|
+++ b/src/basic/missing_magic.h
|
|
@@ -128,6 +128,11 @@
|
|
#define DEVMEM_MAGIC 0x454d444d
|
|
#endif
|
|
|
|
+/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */
|
|
+#ifndef PID_FS_MAGIC
|
|
+#define PID_FS_MAGIC 0x50494446
|
|
+#endif
|
|
+
|
|
/* Not in mainline but included in Ubuntu */
|
|
#ifndef SHIFTFS_MAGIC
|
|
#define SHIFTFS_MAGIC 0x6a656a62
|