]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: drop redundant assignments 30441/head
authorLennart Poettering <lennart@poettering.net>
Tue, 12 Dec 2023 10:02:28 +0000 (11:02 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Dec 2023 11:06:34 +0000 (12:06 +0100)
src/nspawn/nspawn.c

index 22362aeeba6166ed54b6f715f3690e93e3297c07..287b6c18feff340b6a146ba9a2106645410e4f82 100644 (file)
@@ -5643,7 +5643,7 @@ static int run(int argc, char *argv[]) {
                         /* Always take an exclusive lock on our own ephemeral copy. */
                         r = image_path_lock(np, LOCK_EX|LOCK_NB, &tree_global_lock, &tree_local_lock);
                         if (r < 0) {
-                                r = log_error_errno(r, "Failed to create image lock: %m");
+                                log_error_errno(r, "Failed to create image lock: %m");
                                 goto finish;
                         }
 
@@ -5668,11 +5668,11 @@ static int run(int argc, char *argv[]) {
                 } else {
                         r = image_path_lock(arg_image, (arg_read_only ? LOCK_SH : LOCK_EX) | LOCK_NB, &tree_global_lock, &tree_local_lock);
                         if (r == -EBUSY) {
-                                r = log_error_errno(r, "Disk image %s is currently busy.", arg_image);
+                                log_error_errno(r, "Disk image %s is currently busy.", arg_image);
                                 goto finish;
                         }
                         if (r < 0) {
-                                r = log_error_errno(r, "Failed to create image lock: %m");
+                                log_error_errno(r, "Failed to create image lock: %m");
                                 goto finish;
                         }