diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-01-25 13:21:09 +0100 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-01-25 14:27:18 +0100 |
| commit | ed614f17fc9f3876b2178db949df42a2605f6895 (patch) | |
| tree | 15a436289b555f61887b247d3e81dea6d3b06f96 /src/partition | |
| parent | a95ff98ec40edad2825c824a186f44454120cf1f (diff) | |
| download | systemd-ed614f17fc9f3876b2178db949df42a2605f6895.tar.gz | |
partition: fix build with newer linux/btrfs.h uapi header
linux/btrfs.h needs to be included after sys/mount.h, as since [0]
linux/btrfs.h includes linux/fs.h causing build errors:
```
In file included from /usr/include/linux/fs.h:19,
from ../src/basic/linux/btrfs.h:29,
from ../src/partition/growfs.c:6:
/usr/include/sys/mount.h:35:3: error: expected identifier before numeric constant
35 | MS_RDONLY = 1, /* Mount read-only. */
| ^~~~~~~~~
[1222/2169] Compiling C object systemd-creds.p/src_creds_creds.c.o
ninja: build stopped: subcommand failed.
```
See: https://github.com/systemd/systemd/issues/8507
[0] https://github.com/torvalds/linux/commit/a28135303a669917002f569aecebd5758263e4aa
Diffstat (limited to 'src/partition')
| -rw-r--r-- | src/partition/growfs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/partition/growfs.c b/src/partition/growfs.c index 248746f724..62f3ee6744 100644 --- a/src/partition/growfs.c +++ b/src/partition/growfs.c @@ -3,12 +3,17 @@ #include <errno.h> #include <fcntl.h> #include <getopt.h> -#include <linux/btrfs.h> #include <linux/magic.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/types.h> #include <sys/vfs.h> +/* This needs to be included after sys/mount.h, as since [0] linux/btrfs.h + * includes linux/fs.h causing build errors + * See: https://github.com/systemd/systemd/issues/8507 + * [0] https://github.com/torvalds/linux/commit/a28135303a669917002f569aecebd5758263e4aa + */ +#include <linux/btrfs.h> #include "sd-device.h" |