Skip to content

Commit

Permalink
basic: add PIDFS magic (#31709)
Browse files Browse the repository at this point in the history
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 ed01b92)
(cherry picked from commit 3676ca0)
  • Loading branch information
cpackham-atlnz authored and bluca committed Apr 25, 2024
1 parent f309f83 commit a4ce409
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/basic/filesystems-gperf.gperf
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions src/basic/missing_magic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a4ce409

Please sign in to comment.