diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 07:54:09 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 07:55:23 +0100 |
| commit | 1e54f0ab15c05e1dd1ba05562c68cc7a05796936 (patch) | |
| tree | 5e31f702de2483ca3f8d19a6cedadafcfb69053b /src/basic | |
| parent | missing: move input related entries to missing_input.h (diff) | |
| download | systemd-1e54f0ab15c05e1dd1ba05562c68cc7a05796936.tar.xz systemd-1e54f0ab15c05e1dd1ba05562c68cc7a05796936.zip | |
missing: move entries defined in magic.h to missing_magic.h
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/meson.build | 1 | ||||
| -rw-r--r-- | src/basic/missing.h | 49 | ||||
| -rw-r--r-- | src/basic/missing_magic.h | 34 |
3 files changed, 36 insertions, 48 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build index 656e21527e..5b8ccb495b 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -101,6 +101,7 @@ basic_sources = files(''' missing_if_tunnel.h missing_input.h missing_keyctl.h + missing_magic.h missing_network.h missing_securebits.h missing_syscall.h diff --git a/src/basic/missing.h b/src/basic/missing.h index 4db565660d..bfd9f23b94 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -143,46 +143,10 @@ struct sockaddr_vm { #define FS_NOCOW_FL 0x00800000 #endif -#ifndef BTRFS_SUPER_MAGIC -#define BTRFS_SUPER_MAGIC 0x9123683E -#endif - -#ifndef CGROUP_SUPER_MAGIC -#define CGROUP_SUPER_MAGIC 0x27e0eb -#endif - -#ifndef CGROUP2_SUPER_MAGIC -#define CGROUP2_SUPER_MAGIC 0x63677270 -#endif - #ifndef CLONE_NEWCGROUP #define CLONE_NEWCGROUP 0x02000000 #endif -#ifndef TMPFS_MAGIC -#define TMPFS_MAGIC 0x01021994 -#endif - -#ifndef MQUEUE_MAGIC -#define MQUEUE_MAGIC 0x19800202 -#endif - -#ifndef SECURITYFS_MAGIC -#define SECURITYFS_MAGIC 0x73636673 -#endif - -#ifndef TRACEFS_MAGIC -#define TRACEFS_MAGIC 0x74726163 -#endif - -#ifndef BPF_FS_MAGIC -#define BPF_FS_MAGIC 0xcafe4a11 -#endif - -#ifndef OCFS2_SUPER_MAGIC -#define OCFS2_SUPER_MAGIC 0x7461636f -#endif - #ifndef MS_MOVE #define MS_MOVE 8192 #endif @@ -251,14 +215,6 @@ struct sockaddr_vm { #define PR_SET_MM_ENV_END 11 #endif -#ifndef EFIVARFS_MAGIC -#define EFIVARFS_MAGIC 0xde5e81e4 -#endif - -#ifndef SMACK_MAGIC -#define SMACK_MAGIC 0x43415d53 -#endif - #ifndef DM_DEFERRED_REMOVE #define DM_DEFERRED_REMOVE (1 << 17) #endif @@ -416,10 +372,6 @@ struct sockaddr_vm { # define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64) #endif -#ifndef NSFS_MAGIC -#define NSFS_MAGIC 0x6e736673 -#endif - #ifndef NS_GET_NSTYPE #define NS_GET_NSTYPE _IO(0xb7, 0x3) #endif @@ -484,5 +436,6 @@ struct statx { #include "missing_btrfs_tree.h" #include "missing_input.h" +#include "missing_magic.h" #include "missing_network.h" #include "missing_syscall.h" diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h new file mode 100644 index 0000000000..4910cd368f --- /dev/null +++ b/src/basic/missing_magic.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +#include <linux/magic.h> + +/* 62aa81d7c4c24b90fdb61da70ac0dbbc414f9939 (4.13) */ +#ifndef OCFS2_SUPER_MAGIC +#define OCFS2_SUPER_MAGIC 0x7461636f +#endif + +/* 67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff (4.5) */ +#ifndef CGROUP2_SUPER_MAGIC +#define CGROUP2_SUPER_MAGIC 0x63677270 +#endif + +/* 4282d60689d4f21b40692029080440cc58e8a17d (4.1) */ +#ifndef TRACEFS_MAGIC +#define TRACEFS_MAGIC 0x74726163 +#endif + +/* e149ed2b805fefdccf7ccdfc19eca22fdd4514ac (3.19) */ +#ifndef NSFS_MAGIC +#define NSFS_MAGIC 0x6e736673 +#endif + +/* b2197755b2633e164a439682fb05a9b5ea48f706 (4.4) */ +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif + +/* Not exposed yet (4.20). Defined at ipc/mqueue.c */ +#ifndef MQUEUE_MAGIC +#define MQUEUE_MAGIC 0x19800202 +#endif |