X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fmount-util.h;h=deaa77950e50273b9e29003d64f7c92a1ddc6c7f;hb=4a7059686430f596810f0c83e4897154828fd352;hp=9b36bc1453e214f09c336a37179c22230b6d9b19;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22;p=elogind.git

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 9b36bc145..deaa77950 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -24,29 +22,51 @@
 #include <fcntl.h>
 #include <mntent.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "macro.h"
 #include "missing.h"
 
 int fd_is_mount_point(int fd, const char *filename, int flags);
-int path_is_mount_point(const char *path, int flags);
+int path_is_mount_point(const char *path, const char *root, int flags);
 
-// UNNEEDED int repeat_unmount(const char *path, int flags);
+#if 0 /// UNNEEDED by elogind
+int repeat_unmount(const char *path, int flags);
 
-// UNNEEDED int umount_recursive(const char *target, int flags);
-// UNNEEDED int bind_remount_recursive(const char *prefix, bool ro);
+int umount_recursive(const char *target, int flags);
+int bind_remount_recursive(const char *prefix, bool ro, char **blacklist);
 
-// UNNEEDED int mount_move_root(const char *path);
+int mount_move_root(const char *path);
+#endif // 0
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
 #define _cleanup_endmntent_ _cleanup_(endmntentp)
 
-// UNNEEDED bool fstype_is_network(const char *fstype);
+#if 0 /// UNNEEDED by elogind
+bool fstype_is_network(const char *fstype);
+#endif // 0
 
 union file_handle_union {
         struct file_handle handle;
         char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
 };
 
+const char* mode_to_inaccessible_node(mode_t mode);
+
 #define FILE_HANDLE_INIT { .handle.handle_bytes = MAX_HANDLE_SZ }
+
+#if 0 /// UNNEEDED by elogind
+int mount_verbose(
+                int error_log_level,
+                const char *what,
+                const char *where,
+                const char *type,
+                unsigned long flags,
+                const char *options);
+int umount_verbose(const char *where);
+#endif // 0
+
+const char *mount_propagation_flags_to_string(unsigned long flags);
+int mount_propagation_flags_from_string(const char *name, unsigned long *ret);