Prep v234: Apply missing upstream fixes in src/basic (1/6)

[elogind.git] / src / basic / mount-util.h

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 57cfc3628f46687bcbddb19b76c7c14e61fcbf94..56a1f8487d975355a272426bc364de4efb6e61c3 100644 (file)
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -37,6 +37,7 @@ int repeat_unmount(const char *path, int flags);
 
 int umount_recursive(const char *target, int flags);
 int bind_remount_recursive(const char *prefix, bool ro, char **blacklist);
+int bind_remount_recursive_with_mountinfo(const char *prefix, bool ro, char **blacklist, FILE *proc_self_mountinfo);
 
 int mount_move_root(const char *path);
 #endif // 0
@@ -66,7 +67,7 @@ int mount_verbose(
                 unsigned long flags,
                 const char *options);
 int umount_verbose(const char *where);
-#endif // 0
 
 const char *mount_propagation_flags_to_string(unsigned long flags);
-unsigned long mount_propagation_flags_from_string(const char *name);
+int mount_propagation_flags_from_string(const char *name, unsigned long *ret);
+#endif // 0