X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fumount.c;fp=src%2Fcore%2Fumount.c;h=8c69e74caf06d42c5d7a9caf37bf3c50fc6b1f84;hb=b92bea5d2a9481de69bb627a7b442a9f58fca43d;hp=95e47e3c5ac4a9a084dbb7621f7e2b84c7ce1f7d;hpb=8c62ecf1a99ab4a3f69cb81be38715c504ef5723;p=elogind.git

diff --git a/src/core/umount.c b/src/core/umount.c
index 95e47e3c5..8c69e74ca 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -381,7 +381,13 @@ static int delete_loopback(const char *device) {
 static int delete_dm(dev_t devnum) {
         int _cleanup_close_ 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;
 }