chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: support ephemeral boots from images
[elogind.git]
/
src
/
basic
/
mount-util.c
diff --git
a/src/basic/mount-util.c
b/src/basic/mount-util.c
index 16b6a586761e3753c326d2c1d48b8bdb2eeb8856..051b14b179596f35b213c3f6685151e9f7409863 100644
(file)
--- a/
src/basic/mount-util.c
+++ b/
src/basic/mount-util.c
@@
-161,7
+161,7
@@
int fd_is_mount_point(int fd, const char *filename, int flags) {
fallback_fdinfo:
r = fd_fdinfo_mnt_id(fd, filename, flags, &mount_id);
fallback_fdinfo:
r = fd_fdinfo_mnt_id(fd, filename, flags, &mount_id);
- if (
IN_SET(r, -EOPNOTSUPP, -EACCES)
)
+ if (
r == -EOPNOTSUPP
)
goto fallback_fstat;
if (r < 0)
return r;
goto fallback_fstat;
if (r < 0)
return r;
@@
-583,6
+583,7
@@
const char* mode_to_inaccessible_node(mode_t mode) {
return NULL;
}
return NULL;
}
+#if 0 /// UNNEEDED by elogind
#define FLAG(name) (flags & name ? STRINGIFY(name) "|" : "")
static char* mount_flags_to_string(long unsigned flags) {
char *x;
#define FLAG(name) (flags & name ? STRINGIFY(name) "|" : "")
static char* mount_flags_to_string(long unsigned flags) {
char *x;
@@
-642,7
+643,7
@@
static char* mount_flags_to_string(long unsigned flags) {
FLAG(MS_I_VERSION),
FLAG(MS_STRICTATIME),
FLAG(MS_LAZYTIME),
FLAG(MS_I_VERSION),
FLAG(MS_STRICTATIME),
FLAG(MS_LAZYTIME),
- y
, NULL
);
+ y);
if (!x)
return NULL;
if (!y)
if (!x)
return NULL;
if (!y)
@@
-687,3
+688,4
@@
int umount_verbose(const char *what) {
return log_error_errno(errno, "Failed to unmount %s: %m", what);
return 0;
}
return log_error_errno(errno, "Failed to unmount %s: %m", what);
return 0;
}
+#endif // 0