From c8e2a76807adabd9b960925ae599c3b8b66a11ff Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 14 Oct 2021 17:23:29 +0200 Subject: [PATCH] homework: remove duplicate error logging when doing ext4 resizes --- src/home/homework-luks.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 1f459fedc7c..43174f311bf 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -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."); -- 2.47.3