chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: make SYSTEMD_CGROUP_CONTROLLER a special string
[elogind.git]
/
src
/
basic
/
mount-util.h
diff --git
a/src/basic/mount-util.h
b/src/basic/mount-util.h
index ad30727fea738649c3b5cb51885d689402e0bc57..ea887e162f49dc9b1c09adec480fc76da8da8977 100644
(file)
--- 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
/***
#pragma once
/***
@@
-24,20
+22,21
@@
#include <fcntl.h>
#include <mntent.h>
#include <stdbool.h>
#include <fcntl.h>
#include <mntent.h>
#include <stdbool.h>
+#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.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);
#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 by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int repeat_unmount(const char *path, int flags);
int umount_recursive(const char *target, int flags);
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 mount_move_root(const char *path);
#endif // 0
int mount_move_root(const char *path);
#endif // 0
@@
-45,8
+44,7
@@
int mount_move_root(const char *path);
DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
#define _cleanup_endmntent_ _cleanup_(endmntentp)
DEFINE_TRIVIAL_CLEANUP_FUNC(FILE*, endmntent);
#define _cleanup_endmntent_ _cleanup_(endmntentp)
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
bool fstype_is_network(const char *fstype);
#endif // 0
bool fstype_is_network(const char *fstype);
#endif // 0
@@
-55,4
+53,17
@@
union file_handle_union {
char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
};
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 }
#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