chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 3c63a391db2da04198d849aebed40edbbbf1d04a..4f245555f225b15ac321292c774d8eb2b631fbbb 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-293,7
+293,7
@@
static int mount_add_requires_mounts_links(Mount *m) {
}
static char* mount_test_option(const char *haystack, const char *needle) {
}
static char* mount_test_option(const char *haystack, const char *needle) {
- struct mntent me;
+ struct mntent me
= { .mnt_opts = (char*) haystack }
;
assert(needle);
assert(needle);
@@
-303,9
+303,6
@@
static char* mount_test_option(const char *haystack, const char *needle) {
if (!haystack)
return NULL;
if (!haystack)
return NULL;
- zero(me);
- me.mnt_opts = (char*) haystack;
-
return hasmntopt(&me, needle);
}
return hasmntopt(&me, needle);
}
@@
-439,9
+436,9
@@
static int mount_add_quota_links(Mount *m) {
}
static int mount_add_default_dependencies(Mount *m) {
}
static int mount_add_default_dependencies(Mount *m) {
-
int r
;
+
const char *after, *after2, *online
;
MountParameters *p;
MountParameters *p;
-
const char *after, *after2, *setup
;
+
int r
;
assert(m);
assert(m);
@@
-459,11
+456,11
@@
static int mount_add_default_dependencies(Mount *m) {
if (mount_is_network(p)) {
after = SPECIAL_REMOTE_FS_PRE_TARGET;
after2 = SPECIAL_NETWORK_TARGET;
if (mount_is_network(p)) {
after = SPECIAL_REMOTE_FS_PRE_TARGET;
after2 = SPECIAL_NETWORK_TARGET;
-
setup = SPECIAL_REMOTE_FS_SETUP
_TARGET;
+
online = SPECIAL_NETWORK_ONLINE
_TARGET;
} else {
after = SPECIAL_LOCAL_FS_PRE_TARGET;
after2 = NULL;
} else {
after = SPECIAL_LOCAL_FS_PRE_TARGET;
after2 = NULL;
-
setup
= NULL;
+
online
= NULL;
}
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
}
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
@@
-476,8
+473,8
@@
static int mount_add_default_dependencies(Mount *m) {
return r;
}
return r;
}
- if (
setup
) {
- r = unit_add_
dependency_by_name(UNIT(m), UNIT_WANTS, setup
, NULL, true);
+ if (
online
) {
+ r = unit_add_
two_dependencies_by_name(UNIT(m), UNIT_WANTS, UNIT_AFTER, online
, NULL, true);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-520,7
+517,7
@@
static int mount_fix_timeouts(Mount *m) {
if (!t)
return -ENOMEM;
if (!t)
return -ENOMEM;
- r = parse_
u
sec(t, &u);
+ r = parse_sec(t, &u);
free(t);
if (r < 0) {
free(t);
if (r < 0) {
@@
-1706,25
+1703,27
@@
static void mount_shutdown(Manager *m) {
static int mount_enumerate(Manager *m) {
int r;
static int mount_enumerate(Manager *m) {
int r;
- struct epoll_event ev;
assert(m);
if (!m->proc_self_mountinfo) {
assert(m);
if (!m->proc_self_mountinfo) {
- if (!(m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re")))
+ struct epoll_event ev = {
+ .events = EPOLLPRI,
+ .data.ptr = &m->mount_watch,
+ };
+
+ m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
+ if (!m->proc_self_mountinfo)
return -errno;
m->mount_watch.type = WATCH_MOUNT;
m->mount_watch.fd = fileno(m->proc_self_mountinfo);
return -errno;
m->mount_watch.type = WATCH_MOUNT;
m->mount_watch.fd = fileno(m->proc_self_mountinfo);
- zero(ev);
- ev.events = EPOLLPRI;
- ev.data.ptr = &m->mount_watch;
-
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
return -errno;
}
if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
return -errno;
}
- if ((r = mount_load_proc_self_mountinfo(m, false)) < 0)
+ r = mount_load_proc_self_mountinfo(m, false);
+ if (r < 0)
goto fail;
return 0;
goto fail;
return 0;