home: drop conflicted headers

Fixes #24117.

diff --git a/src/basic/missing_fs.h b/src/basic/missing_fs.h
index 0cacd49bcff7eb500e7ed388091e51ebada3a0e3..6638d7696221d17ada03e392fad61c89c3bc50a4 100644 (file)
--- a/src/basic/missing_fs.h
+++ b/src/basic/missing_fs.h
@@ -64,3 +64,8 @@
 #ifndef FS_PROJINHERIT_FL
 #define FS_PROJINHERIT_FL 0x20000000
 #endif
+
+/* linux/fscrypt.h */
+#ifndef FS_KEY_DESCRIPTOR_SIZE
+#define FS_KEY_DESCRIPTOR_SIZE 8
+#endif

diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index 728a92260cfdb9253eca1fdd37a5b76679255bc8..e79def3daec75a3c5215eb9c9f45b3b815fa813d 100644 (file)
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -1,5 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/mount.h>
+#if WANT_LINUX_FS_H
+#include <linux/fs.h>
+#endif
+
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c
index 0108ab54075f3482bc691357d53f9e0a1210c5fd..5f3e79a67aad8aca168f774c5229a48522b0592b 100644 (file)
--- a/src/home/homework-luks.c
+++ b/src/home/homework-luks.c
@@ -4,7 +4,6 @@
 #include <poll.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/mount.h>
 #include <sys/xattr.h>
 
 #if HAVE_VALGRIND_MEMCHECK_H

diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c
index e71e8cd8538179497e05cb5fd51780aea854e3a7..a9c793c42943914882d60caab43b5cdd97b8e9f3 100644 (file)
--- a/src/home/homework-mount.c
+++ b/src/home/homework-mount.c
@@ -2,7 +2,9 @@
 
 #include <sched.h>
 #include <sys/mount.h>
+#if WANT_LINUX_FS_H
 #include <linux/fs.h>
+#endif
 
 #include "alloc-util.h"
 #include "fd-util.h"

diff --git a/src/home/homework.h b/src/home/homework.h
index 882a3f500b3bfcf0151e7a8f510f6004a600dce1..b27c31d56bab562e54050440e7cf2c7b8213fae4 100644 (file)
--- a/src/home/homework.h
+++ b/src/home/homework.h
@@ -1,13 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <linux/fs.h>
 #include <sys/vfs.h>
 
 #include "sd-id128.h"
 
+#include "cryptsetup-util.h"
 #include "homework-password-cache.h"
 #include "loop-util.h"
+#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
 #include "missing_keyctl.h"
 #include "missing_syscall.h"
 #include "user-record.h"