bus: rename KDBUS_CMD_FNAME_POLICY_NONE -> KDBUS_CMD_FNAME_POLICY_OPEN

[elogind.git] / src / core / umount.c

diff --git a/src/core/umount.c b/src/core/umount.c
index 3fcb90eca4d9219e128cca90c957b668ffd15b04..8c69e74caf06d42c5d7a9caf37bf3c50fc6b1f84 100644 (file)
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -379,25 +379,23 @@ static int delete_loopback(const char *device) {
 }
 
 static int delete_dm(dev_t devnum) {
-        int fd, r;
-        struct dm_ioctl dm;
+        int _cleanup_close_ fd = -1;
+        int r;
+        struct dm_ioctl dm = {
+                .version = {DM_VERSION_MAJOR,
+                            DM_VERSION_MINOR,
+                            DM_VERSION_PATCHLEVEL},
+                .data_size = sizeof(dm),
+                .dev = devnum,
+        };
 
         assert(major(devnum) != 0);
 
-        if ((fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC)) < 0)
+        fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC);
+        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);
-        close_nointr_nofail(fd);
-
         return r >= 0 ? 0 : -errno;
 }