X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fmount-util.h;h=9ed5b284ceab5e275c02a1ac30b9c49b8accd02e;hb=71227310a62a616a0d9356fe0506e01f47c76eb3;hp=9b36bc1453e214f09c336a37179c22230b6d9b19;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22;p=elogind.git diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h index 9b36bc145..9ed5b284c 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,37 @@ #include #include #include +#include #include #include +#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); -// 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); -// 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 }