X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fmount-util.h;h=56a1f8487d975355a272426bc364de4efb6e61c3;hp=9ed5b284ceab5e275c02a1ac30b9c49b8accd02e;hb=9742b1e43855b1599bd52ff95af995d9a9d35eac;hpb=eeeff96fedd10487ca12e246832475090b245d36 diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h index 9ed5b284c..56a1f8487 100644 --- a/src/basic/mount-util.h +++ b/src/basic/mount-util.h @@ -30,13 +30,14 @@ #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); #if 0 /// UNNEEDED by elogind 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); +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 @@ -56,3 +57,17 @@ union file_handle_union { 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); + +const char *mount_propagation_flags_to_string(unsigned long flags); +int mount_propagation_flags_from_string(const char *name, unsigned long *ret); +#endif // 0