X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=a39076838b205f80fc0b2110131bfa78566adcf9;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=5f2de64eb99d9d5e6e492ad6913708f9c2d2ebb6;hpb=affc3d834347076e8616948978e70ed1fca84db4;p=elogind.git

diff --git a/src/core/mount.c b/src/core/mount.c
index 5f2de64eb..a39076838 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -45,6 +45,9 @@
 #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,
@@ -74,13 +77,13 @@ static bool mount_needs_network(const char *options, const char *fstype) {
         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"))
@@ -98,13 +101,13 @@ static bool mount_is_bind(MountParameters *p) {
         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))
@@ -1441,17 +1444,13 @@ static int mount_add_one(
                         }
                 }
 
-                if (m->running_as == SYSTEMD_SYSTEM) {
-                        const char* target;
-
-                        target = mount_needs_network(options, fstype) ?  SPECIAL_REMOTE_FS_TARGET : NULL;
+                if (m->running_as == SYSTEMD_SYSTEM &&
+                    mount_needs_network(options, fstype)) {
                         /* _netdev option may have shown up late, or on a
                          * remount. Add remote-fs dependencies, even though
-                         * local-fs ones may already be there */
-                        if (target) {
-                                unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
-                                load_extras = true;
-                        }
+                         * local-fs ones may already be there. */
+                        unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, NULL, true);
+                        load_extras = true;
                 }
 
                 if (u->load_state == UNIT_NOT_FOUND) {
@@ -1518,17 +1517,9 @@ fail:
         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;
 
@@ -1539,15 +1530,22 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
         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);
@@ -1559,7 +1557,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
                         return log_oom();
 
                 k = mount_add_one(m, d, p, options, fstype, set_flags);
-                if (k < 0)
+                if (r == 0 && k < 0)
                         r = k;
         }
 
@@ -1621,6 +1619,8 @@ static int mount_enumerate(Manager *m) {
                 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;
@@ -1657,8 +1657,8 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
 
         /* 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];
@@ -1666,18 +1666,18 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
                 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;
         }