| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 2 Aug 2023 12:18:24 -0700 |
| Subject: [PATCH] include missing sys/file.h for LOCK_EX |
| |
| Upstream-Status: Backport [https://github.com/systemd/systemd/pull/28651] |
| --- |
| src/core/execute.c | 1 + |
| src/shared/btrfs-util.c | 1 + |
| src/shared/copy.c | 1 + |
| src/test/test-btrfs.c | 1 + |
| src/test/test-fs-util.c | 1 + |
| src/test/test-lock-util.c | 1 + |
| src/vconsole/vconsole-setup.c | 1 + |
| 7 files changed, 7 insertions(+) |
| |
| diff --git a/src/core/execute.c b/src/core/execute.c |
| index 5b2ae861ff..2ebf19ffaa 100644 |
| --- a/src/core/execute.c |
| +++ b/src/core/execute.c |
| @@ -4,6 +4,7 @@ |
| #include <fcntl.h> |
| #include <poll.h> |
| #include <sys/eventfd.h> |
| +#include <sys/file.h> |
| #include <sys/ioctl.h> |
| #include <sys/mman.h> |
| #include <sys/mount.h> |
| diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c |
| index 5128b308ab..3ded95ea82 100644 |
| --- a/src/shared/btrfs-util.c |
| +++ b/src/shared/btrfs-util.c |
| @@ -10,6 +10,7 @@ |
| #include <stddef.h> |
| #include <stdio.h> |
| #include <stdlib.h> |
| +#include <sys/file.h> |
| #include <sys/ioctl.h> |
| #include <sys/sysmacros.h> |
| #include <unistd.h> |
| diff --git a/src/shared/copy.c b/src/shared/copy.c |
| index 241a2d112b..7e47dc002c 100644 |
| --- a/src/shared/copy.c |
| +++ b/src/shared/copy.c |
| @@ -6,6 +6,7 @@ |
| #include <stddef.h> |
| #include <stdio.h> |
| #include <stdlib.h> |
| +#include <sys/file.h> |
| #include <sys/ioctl.h> |
| #include <sys/sendfile.h> |
| #include <sys/xattr.h> |
| diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c |
| index 95b7ef25d8..ba09563058 100644 |
| --- a/src/test/test-btrfs.c |
| +++ b/src/test/test-btrfs.c |
| @@ -1,6 +1,7 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| #include <fcntl.h> |
| +#include <sys/file.h> |
| |
| #include "btrfs-util.h" |
| #include "fd-util.h" |
| diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c |
| index 1beba916a4..5de1eea0d4 100644 |
| --- a/src/test/test-fs-util.c |
| +++ b/src/test/test-fs-util.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <sys/file.h> |
| #include <unistd.h> |
| |
| #include "alloc-util.h" |
| diff --git a/src/test/test-lock-util.c b/src/test/test-lock-util.c |
| index a9a1b438ff..28fc54a5d6 100644 |
| --- a/src/test/test-lock-util.c |
| +++ b/src/test/test-lock-util.c |
| @@ -1,5 +1,6 @@ |
| /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
| |
| +#include <sys/file.h> |
| #include <unistd.h> |
| |
| #include "fd-util.h" |
| diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
| index d57d8b4001..86348d08c1 100644 |
| --- a/src/vconsole/vconsole-setup.c |
| +++ b/src/vconsole/vconsole-setup.c |
| @@ -11,6 +11,7 @@ |
| #include <linux/vt.h> |
| #include <stdbool.h> |
| #include <stdlib.h> |
| +#include <sys/file.h> |
| #include <sys/ioctl.h> |
| #include <sysexits.h> |
| #include <termios.h> |