From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Aug 2022 09:16:40 +0000 (+0200)
Subject: umount: use structured initialization
X-Git-Tag: v252-rc1~246^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efc90b98142889d443a86c18304f1b13ebda9ddb;p=thirdparty%2Fsystemd.git

umount: use structured initialization
---

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 9e9888bce8e..6d133d57619 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -151,17 +151,21 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
                         remount_flags = (remount_flags|MS_REMOUNT|MS_RDONLY) & ~MS_BIND;
                 }
 
-                m = new0(MountPoint, 1);
+                m = new(MountPoint, 1);
                 if (!m)
                         return log_oom();
 
+                *m = (MountPoint) {
+                        .remount_options = remount_options,
+                        .remount_flags = remount_flags,
+                        .try_remount_ro = try_remount_ro,
+                };
+
                 m->path = strdup(path);
                 if (!m->path)
                         return log_oom();
 
-                m->remount_options = TAKE_PTR(remount_options);
-                m->remount_flags = remount_flags;
-                m->try_remount_ro = try_remount_ro;
+                TAKE_PTR(remount_options);
 
                 LIST_PREPEND(mount_point, *head, TAKE_PTR(m));
         }