#include "exit-status.h"
#include "def.h"
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_table*, mnt_free_table);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_iter*, mnt_free_iter);
+
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE,
[MOUNT_MOUNTING] = UNIT_ACTIVATING,
return false;
}
-static bool mount_is_network(MountParameters *p) {
+static bool mount_is_network(const MountParameters *p) {
assert(p);
return mount_needs_network(p->options, p->fstype);
}
-static bool mount_is_bind(MountParameters *p) {
+static bool mount_is_bind(const MountParameters *p) {
assert(p);
if (mount_test_option(p->options, "bind"))
return false;
}
-static bool mount_is_auto(MountParameters *p) {
+static bool mount_is_auto(const MountParameters *p) {
assert(p);
return !mount_test_option(p->options, "noauto");
}
-static bool needs_quota(MountParameters *p) {
+static bool needs_quota(const MountParameters *p) {
assert(p);
if (mount_is_network(p))
return r;
}
-static inline void mnt_free_table_p(struct libmnt_table **tb) {
- mnt_free_table(*tb);
-}
-
-static inline void mnt_free_iter_p(struct libmnt_iter **itr) {
- mnt_free_iter(*itr);
-}
-
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
- _cleanup_(mnt_free_table_p) struct libmnt_table *tb = NULL;
- _cleanup_(mnt_free_iter_p) struct libmnt_iter *itr = NULL;
+ _cleanup_(mnt_free_tablep) struct libmnt_table *tb = NULL;
+ _cleanup_(mnt_free_iterp) struct libmnt_iter *itr = NULL;
struct libmnt_fs *fs;
int r = 0;
if (!tb || !itr)
return log_oom();
- mnt_table_parse_mtab(tb, NULL);
- if (r)
+ r = mnt_table_parse_mtab(tb, NULL);
+ if (r < 0)
return r;
- while (mnt_table_next_fs(tb, itr, &fs) == 0) {
+ r = 0;
+ for (;;) {
const char *device, *path, *options, *fstype;
_cleanup_free_ const char *d = NULL, *p = NULL;
int k;
+ k = mnt_table_next_fs(tb, itr, &fs);
+ if (k == 1)
+ break;
+ else if (k < 0)
+ return log_error_errno(k, "Failed to get next entry from /etc/fstab: %m");
+
device = mnt_fs_get_source(fs);
path = mnt_fs_get_target(fs);
options = mnt_fs_get_options(fs);
return log_oom();
k = mount_add_one(m, d, p, options, fstype, set_flags);
- if (k < 0)
+ if (r == 0 && k < 0)
r = k;
}
if (m->utab_inotify_fd < 0)
goto fail_with_errno;
+ (void) mkdir_p_label("/run/mount", 0755);
+
r = inotify_add_watch(m->utab_inotify_fd, "/run/mount", IN_MOVED_TO);
if (r < 0)
goto fail_with_errno;
/* The manager calls this for every fd event happening on the
* /proc/self/mountinfo file, which informs us about mounting
- * table changes
- * This may also be called for /run/mount events */
+ * table changes, and for /run/mount events which we watch
+ * for mount options. */
if (fd == m->utab_inotify_fd) {
char inotify_buffer[sizeof(struct inotify_event) + NAME_MAX + 1];
char *p;
int rescan = 0;
- while ((r = read(fd, inotify_buffer, sizeof(inotify_buffer))) > 0) {
+ while ((r = read(fd, inotify_buffer, sizeof(inotify_buffer))) > 0)
for (p = inotify_buffer; p < inotify_buffer + r; ) {
event = (struct inotify_event *) p;
/* only care about changes to utab, but we have
* to monitor the directory to reliably get
* notifications about when utab is replaced
* using rename(2) */
- if (strcmp(event->name, "utab") == 0)
+ if ((event->mask & IN_Q_OVERFLOW) || streq(event->name, "utab"))
rescan = 1;
p += sizeof(struct inotify_event) + event->len;
}
- }
+
if (!rescan)
return 0;
}