X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=mount.c;h=325f2d51e56be54cd916707fe7d583190ed96eb9;hp=d9d461a59478e0868fed1ab5a626a87f61cfb613;hb=dad08730c43807c5b9f9aa3f164c31997e66eea3;hpb=f50e0a012340fa8dfe6ec7f0cd869f5f3a052d7a
diff --git a/mount.c b/mount.c
index d9d461a59..325f2d51e 100644
--- a/mount.c
+++ b/mount.c
@@ -1,8 +1,29 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
#include
+#include
+#include
#include "unit.h"
#include "mount.h"
@@ -27,17 +48,20 @@ static const char* const state_string_table[_MOUNT_STATE_MAX] = {
};
static void mount_done(Unit *u) {
- Mount *d = MOUNT(u);
+ Mount *m = MOUNT(u);
- assert(d);
- free(d->what);
- free(d->where);
+ assert(m);
+ free(m->what);
+ free(m->where);
}
static void mount_set_state(Mount *m, MountState state) {
MountState old_state;
assert(m);
+ if (state == m->state)
+ return;
+
old_state = m->state;
m->state = state;
@@ -83,6 +107,10 @@ static UnitActiveState mount_active_state(Unit *u) {
}
static void mount_shutdown(Manager *m) {
+ assert(m);
+
+ if (m->proc_self_mountinfo)
+ fclose(m->proc_self_mountinfo);
}
static int mount_add_node_links(Mount *m) {
@@ -97,7 +125,7 @@ static int mount_add_node_links(Mount *m) {
if (!path_startswith(m->what, "/dev/"))
return 0;
- if (!(e = unit_name_escape_path("node-", m->what+1, ".device")))
+ if (!(e = unit_name_escape_path(m->what+1, ".device")))
return -ENOMEM;
r = manager_load_unit(UNIT(m)->meta.manager, e, &device);
@@ -119,35 +147,34 @@ static int mount_add_node_links(Mount *m) {
}
static int mount_add_path_links(Mount *m) {
- Iterator i;
- Unit *other;
+ Meta *other;
int r;
/* Adds in link to other mount points, that might lie below or
* above us in the hierarchy */
- HASHMAP_FOREACH(other, UNIT(m)->meta.manager->units, i) {
+ LIST_FOREACH(units_per_type, other, UNIT(m)->meta.manager->units_per_type[UNIT_MOUNT]) {
Mount *n;
- if (other->meta.type != UNIT_MOUNT)
- continue;
+ n = (Mount*) other;
- n = MOUNT(other);
+ if (n == m)
+ continue;
if (path_startswith(m->where, n->where)) {
- if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, other)) < 0)
+ if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, (Unit*) other)) < 0)
return r;
- if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, other)) < 0)
+ if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, (Unit*) other)) < 0)
return r;
} else if (startswith(n->where, m->where)) {
- if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, other)) < 0)
+ if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, (Unit*) other)) < 0)
return r;
- if ((r = unit_add_dependency(other, UNIT_REQUIRES, UNIT(m))) < 0)
+ if ((r = unit_add_dependency((Unit*) other, UNIT_REQUIRES, UNIT(m))) < 0)
return r;
}
}
@@ -155,7 +182,7 @@ static int mount_add_path_links(Mount *m) {
return 0;
}
-static int mount_add_one(Manager *m, const char *what, const char *where, bool live) {
+static int mount_add_one(Manager *m, const char *what, const char *where, bool live, bool set_flags) {
char *e;
int r;
Unit *u;
@@ -170,9 +197,9 @@ static int mount_add_one(Manager *m, const char *what, const char *where, bool l
return 0;
if (streq(where, "/"))
- e = strdup("rootfs.mount");
+ e = strdup("-.mount");
else
- e = unit_name_escape_path("fs-", where+1, ".mount");
+ e = unit_name_escape_path(where+1, ".mount");
if (!e)
return -ENOMEM;
@@ -199,15 +226,25 @@ static int mount_add_one(Manager *m, const char *what, const char *where, bool l
if ((r = unit_set_description(u, where)) < 0)
goto fail;
+
+ unit_add_to_load_queue(u);
} else {
delete = false;
free(e);
}
- if (live)
+ if (set_flags)
+ MOUNT(u)->still_exists = true;
+
+ if (live) {
+ if (set_flags)
+ MOUNT(u)->just_created = !MOUNT(u)->from_proc_self_mountinfo;
MOUNT(u)->from_proc_self_mountinfo = true;
- else
+ } else {
+ if (set_flags)
+ MOUNT(u)->just_created = !MOUNT(u)->from_etc_fstab;
MOUNT(u)->from_etc_fstab = true;
+ }
if ((r = mount_add_node_links(MOUNT(u))) < 0)
goto fail;
@@ -215,7 +252,7 @@ static int mount_add_one(Manager *m, const char *what, const char *where, bool l
if ((r = mount_add_path_links(MOUNT(u))) < 0)
goto fail;
- unit_add_to_load_queue(u);
+ unit_add_to_dbus_queue(u);
return 0;
@@ -264,7 +301,7 @@ static char *fstab_node_to_udev_node(char *p) {
return strdup(p);
}
-static int mount_load_etc_fstab(Manager *m) {
+static int mount_load_etc_fstab(Manager *m, bool set_flags) {
FILE *f;
int r;
struct mntent* me;
@@ -295,7 +332,7 @@ static int mount_load_etc_fstab(Manager *m) {
if (where[0] == '/')
path_kill_slashes(where);
- r = mount_add_one(m, what, where, false);
+ r = mount_add_one(m, what, where, false, set_flags);
free(what);
free(where);
@@ -310,20 +347,18 @@ finish:
return r;
}
-static int mount_load_proc_self_mountinfo(Manager *m) {
- FILE *f;
+static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
int r;
assert(m);
- if (!(f = fopen("/proc/self/mountinfo", "r")))
- return -errno;
+ rewind(m->proc_self_mountinfo);
for (;;) {
int k;
char *device, *path, *d, *p;
- if ((k = fscanf(f,
+ if ((k = fscanf(m->proc_self_mountinfo,
"%*s " /* (1) mount id */
"%*s " /* (2) parent id */
"%*s " /* (3) major:minor */
@@ -333,63 +368,64 @@ static int mount_load_proc_self_mountinfo(Manager *m) {
"%*[^-]" /* (7) optional fields */
"- " /* (8) seperator */
"%*s " /* (9) file system type */
- "%ms" /* (10) mount source */
- "%*[^\n]", /* some rubbish at the end */
+ "%ms" /* (10) mount source */
+ "%*[^\n]", /* some rubbish at the end */
&path,
&device)) != 2) {
- if (k == EOF) {
- if (feof(f))
- break;
-
- r = -errno;
- goto finish;
- }
+ if (k == EOF)
+ break;
- r = -EBADMSG;
- goto finish;
+ return -EBADMSG;
}
if (!(d = cunescape(device))) {
free(device);
free(path);
- r = -ENOMEM;
- goto finish;
+ return -ENOMEM;
}
free(device);
if (!(p = cunescape(path))) {
free(d);
free(path);
- r = -ENOMEM;
- goto finish;
+ return -ENOMEM;
}
free(path);
- r = mount_add_one(m, d, p, true);
+ r = mount_add_one(m, d, p, true, set_flags);
free(d);
free(p);
if (r < 0)
- goto finish;
+ return r;
}
- r = 0;
-
-finish:
- fclose(f);
-
- return r;
+ return 0;
}
static int mount_enumerate(Manager *m) {
int r;
+ struct epoll_event ev;
assert(m);
- if ((r = mount_load_etc_fstab(m)) < 0)
+ if (!(m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "r")))
+ return -errno;
+
+ m->mount_watch.type = WATCH_MOUNT;
+ m->mount_watch.fd = fileno(m->proc_self_mountinfo);
+
+ zero(ev);
+ ev.events = EPOLLERR;
+ ev.data.ptr = &m->mount_watch;
+
+ if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
+ return -errno;
+
+ if ((r = mount_load_etc_fstab(m, false)) < 0)
goto fail;
- if ((r = mount_load_proc_self_mountinfo(m)) < 0)
+ if ((r = mount_load_proc_self_mountinfo(m, false)) < 0)
goto fail;
return 0;
@@ -399,10 +435,44 @@ fail:
return r;
}
+void mount_fd_event(Manager *m, int events) {
+ Meta *meta;
+ int r;
+
+ assert(m);
+ assert(events == EPOLLERR);
+
+ /* The manager calls this for every fd event happening on the
+ * /proc/self/mountinfo file, which informs us about mounting
+ * table changes */
+
+ if ((r = mount_load_proc_self_mountinfo(m, true)) < 0) {
+ log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-errno));
+ return;
+ }
+
+ manager_dispatch_load_queue(m);
+
+ LIST_FOREACH(units_per_type, meta, m->units_per_type[UNIT_MOUNT]) {
+ Mount *mount = (Mount*) meta;
+
+ if (mount->just_created && mount->state == MOUNT_DEAD)
+ mount_set_state(mount, MOUNT_MOUNTED);
+ else if (!mount->still_exists && mount->state == MOUNT_MOUNTED) {
+ mount_set_state(mount, MOUNT_DEAD);
+ mount->from_proc_self_mountinfo = false;
+ }
+
+ /* Clear the flags for later calls */
+ mount->just_created = false;
+ mount->still_exists = false;
+ }
+}
+
const UnitVTable mount_vtable = {
.suffix = ".mount",
- .init = unit_load_fragment_and_dropin,
+ .init = unit_load_fragment_and_dropin_optional,
.done = mount_done,
.coldplug = mount_coldplug,