X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fumount.c;h=1e95ad70dd0beb85394c23fab0b6e25f9075ee7e;hb=a57f7e2c828b852eb32fd810dcea041bb2975501;hp=95e47e3c5ac4a9a084dbb7621f7e2b84c7ce1f7d;hpb=e62d8c3944745ed276e6d4f33153009860e5cfc5;p=elogind.git

diff --git a/src/core/umount.c b/src/core/umount.c
index 95e47e3c5..1e95ad70d 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -379,9 +379,15 @@ static int delete_loopback(const char *device) {
 }
 
 static int delete_dm(dev_t devnum) {
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
         int r;
-        struct dm_ioctl dm;
+        struct dm_ioctl dm = {
+                .version = {DM_VERSION_MAJOR,
+                            DM_VERSION_MINOR,
+                            DM_VERSION_PATCHLEVEL},
+                .data_size = sizeof(dm),
+                .dev = devnum,
+        };
 
         assert(major(devnum) != 0);
 
@@ -389,14 +395,6 @@ static int delete_dm(dev_t devnum) {
         if (fd < 0)
                 return -errno;
 
-        zero(dm);
-        dm.version[0] = DM_VERSION_MAJOR;
-        dm.version[1] = DM_VERSION_MINOR;
-        dm.version[2] = DM_VERSION_PATCHLEVEL;
-
-        dm.data_size = sizeof(dm);
-        dm.dev = devnum;
-
         r = ioctl(fd, DM_DEV_REMOVE, &dm);
         return r >= 0 ? 0 : -errno;
 }
@@ -420,7 +418,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
                          *
                          * Mount points can be stacked. If a mount
                          * point is stacked below / or /usr, we
-                         * cannnot umount or remount it directly,
+                         * cannot umount or remount it directly,
                          * since there is no way to refer to the
                          * underlying mount. There's nothing we can do
                          * about it for the general case, but we can