]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect-image: make mountfsd_make_directory_fd() return param optional
authorLennart Poettering <lennart@poettering.net>
Tue, 18 Nov 2025 21:33:06 +0000 (22:33 +0100)
committerLennart Poettering <lennart@poettering.net>
Sun, 21 Dec 2025 06:04:42 +0000 (07:04 +0100)
src/shared/dissect-image.c

index bb83386c5a2681502d58fdd69103bb157e7e77c5..25041687f940c18868773c8606b7b8efe72f6b43 100644 (file)
@@ -5291,7 +5291,6 @@ int mountfsd_make_directory_fd(
 
         assert(parent_fd >= 0);
         assert(name);
-        assert(ret_directory_fd);
 
         _cleanup_(sd_varlink_unrefp) sd_varlink *vl = NULL;
         r = sd_varlink_connect_address(&vl, "/run/systemd/io.systemd.MountFileSystem");
@@ -5337,7 +5336,8 @@ int mountfsd_make_directory_fd(
         if (directory_fd < 0)
                 return log_error_errno(directory_fd, "Failed to take directory fd from Varlink connection: %m");
 
-        *ret_directory_fd = TAKE_FD(directory_fd);
+        if (ret_directory_fd)
+                *ret_directory_fd = TAKE_FD(directory_fd);
         return 0;
 }