]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
homework: remove duplicate error logging when doing ext4 resizes
authorLennart Poettering <lennart@poettering.net>
Thu, 14 Oct 2021 15:23:29 +0000 (17:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 16 Oct 2021 08:12:15 +0000 (10:12 +0200)
src/home/homework-luks.c

index 1f459fedc7ca4a93db5b6a2f5800011a9a898486..43174f311bf7d521214394ee09807215b280caeb 100644 (file)
@@ -2932,12 +2932,15 @@ int home_resize_luks(
         }
 
         /* Now resize the file system */
-        if (resize_type == CAN_RESIZE_ONLINE)
+        if (resize_type == CAN_RESIZE_ONLINE) {
                 r = resize_fs(setup->root_fd, new_fs_size, NULL);
-        else
+                if (r < 0)
+                        return log_error_errno(r, "Failed to resize file system: %m");
+        } else {
                 r = ext4_offline_resize_fs(setup, new_fs_size, user_record_luks_discard(h), user_record_mount_flags(h));
-        if (r < 0)
-                return log_error_errno(r, "Failed to resize file system: %m");
+                if (r < 0)
+                        return r;
+        }
 
         log_info("File system resizing completed.");