From e688097ce334d8f85781974a09ad05ccdc916c5b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Nov 2024 12:14:52 +0100 Subject: [PATCH 1/4] mountfsd: drop unused variable --- src/mountfsd/mountwork.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c index e9d3c7a81b..ae316a180a 100644 --- a/src/mountfsd/mountwork.c +++ b/src/mountfsd/mountwork.c @@ -276,7 +276,6 @@ static int vl_method_mount_image( Hashmap **polkit_registry = ASSERT_PTR(userdata); _cleanup_free_ char *ps = NULL; bool image_is_trusted = false; - uid_t peer_uid; int r; assert(link); @@ -284,10 +283,6 @@ static int vl_method_mount_image( sd_json_variant_sensitive(parameters); /* might contain passwords */ - r = sd_varlink_get_peer_uid(link, &peer_uid); - if (r < 0) - return log_debug_errno(r, "Failed to get client UID: %m"); - r = sd_varlink_dispatch(link, parameters, dispatch_table, &p); if (r != 0) return r; From 0557f82650efbed618e03f557a91cf724b29b533 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Nov 2024 17:19:26 +0100 Subject: [PATCH 2/4] dissect-image: remove dead code --- src/shared/dissect-image.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index f9418754a8..39c5c8a21a 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -4271,7 +4271,6 @@ int mountfsd_mount_image( _cleanup_close_ int image_fd = -EBADF; _cleanup_(sd_varlink_unrefp) sd_varlink *vl = NULL; _cleanup_free_ char *ps = NULL; - unsigned max_fd = UINT_MAX; const char *error_id; int r; @@ -4365,9 +4364,6 @@ int mountfsd_mount_image( return log_error_errno(r, "Failed to parse partition data: %m"); if (pp.fsmount_fd_idx != UINT_MAX) { - if (max_fd == UINT_MAX || pp.fsmount_fd_idx > max_fd) - max_fd = pp.fsmount_fd_idx; - fsmount_fd = sd_varlink_take_fd(vl, pp.fsmount_fd_idx); if (fsmount_fd < 0) return fsmount_fd; From 9c56a3629fc0ea72f727be083db1cc5b7f7492b7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Nov 2024 23:07:00 +0100 Subject: [PATCH 3/4] mntwork: shorten code --- src/mountfsd/mountwork.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c index ae316a180a..6ffb36167a 100644 --- a/src/mountfsd/mountwork.c +++ b/src/mountfsd/mountwork.c @@ -522,17 +522,13 @@ static int vl_method_mount_image( loop_device_relinquish(loop); - r = sd_varlink_replybo( + return sd_varlink_replybo( link, SD_JSON_BUILD_PAIR("partitions", SD_JSON_BUILD_VARIANT(aj)), SD_JSON_BUILD_PAIR("imagePolicy", SD_JSON_BUILD_STRING(ps)), SD_JSON_BUILD_PAIR("imageSize", SD_JSON_BUILD_INTEGER(di->image_size)), SD_JSON_BUILD_PAIR("sectorSize", SD_JSON_BUILD_INTEGER(di->sector_size)), SD_JSON_BUILD_PAIR_CONDITION(!sd_id128_is_null(di->image_uuid), "imageUuid", SD_JSON_BUILD_UUID(di->image_uuid))); - if (r < 0) - return r; - - return r; } static int process_connection(sd_varlink_server *server, int _fd) { From 4aaabb55c7fe82f480a06efaf85e910436dfbe50 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Nov 2024 17:49:32 +0100 Subject: [PATCH 4/4] nspawn: fix indentation of run_container() parameter list --- src/nspawn/nspawn.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index c8e65f183e..db0d64e62a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -5106,15 +5106,15 @@ static int load_oci_bundle(void) { } static int run_container( - DissectedImage *dissected_image, - int userns_fd, - FDSet *fds, - char veth_name[IFNAMSIZ], - bool *veth_created, - struct ExposeArgs *expose_args, - int *master, - pid_t *pid, - int *ret) { + DissectedImage *dissected_image, + int userns_fd, + FDSet *fds, + char veth_name[IFNAMSIZ], + bool *veth_created, + struct ExposeArgs *expose_args, + int *master, + pid_t *pid, + int *ret) { static const struct sigaction sa = { .sa_handler = nop_signal_handler,