From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 13 Apr 2017 05:42:15 +0000 (+0200)
Subject: Prep v228: Remove left-over BTRFS bits.
X-Git-Tag: v228.1~1^2~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c12afe04a4fc8f18b0d4e280f973d1cd826e82e0

Prep v228: Remove left-over BTRFS bits.
---

diff --git a/configure.ac b/configure.ac
index 3947d82b4..bab6f101f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,6 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
 # ------------------------------------------------------------------------------
 
 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
-AC_CHECK_HEADERS([linux/btrfs.h], [], [])
 AC_CHECK_HEADERS([linux/memfd.h], [], [])
 
 AC_CHECK_HEADERS([printf.h], [have_printf_h=yes], [have_printf_h=no])
@@ -346,7 +345,7 @@ AC_SUBST(CAP_LIBS)
 
 AC_CHECK_FUNCS([memfd_create])
 AC_CHECK_FUNCS([__secure_getenv secure_getenv])
-AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, keyctl, key_serial_t, LO_FLAGS_PARTSCAN],
+AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN],
                [], [], [[
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/basic/missing.h b/src/basic/missing.h
index d539ed00e..a9871f680 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -38,6 +38,8 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#include "musl_missing.h"
+
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif
@@ -257,6 +259,7 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) {
 #define BTRFS_QGROUP_LEVEL_SHIFT 48
 #endif
 
+#if 0 /// UNNEEDED by elogind (It can not support BTRFS at all)
 #ifndef HAVE_LINUX_BTRFS_H
 struct btrfs_ioctl_vol_args {
         int64_t fd;
@@ -507,6 +510,8 @@ struct btrfs_ioctl_quota_ctl_args {
 #define BTRFS_SUPER_MAGIC 0x9123683E
 #endif
 
+#endif // 0
+
 #ifndef CGROUP_SUPER_MAGIC
 #define CGROUP_SUPER_MAGIC 0x27e0eb
 #endif
@@ -1024,8 +1029,11 @@ static inline pid_t raw_getpid(void) {
 #endif
 }
 
+#if 0 /// UNNEEDED by elogind
+
 #if !HAVE_DECL_RENAMEAT2
 
+
 #ifndef __NR_renameat2
 #  if defined __x86_64__
 #    define __NR_renameat2 316
@@ -1125,3 +1133,4 @@ static inline key_serial_t request_key(const char *type, const char *description
 #ifndef KEY_SPEC_USER_KEYRING
 #define KEY_SPEC_USER_KEYRING -4
 #endif
+#endif // 0