From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 12 Oct 2022 18:01:37 +0000 (+0200)
Subject: repart: Use copy_bytes() instead of copy_bytes_full()
X-Git-Tag: v253-rc1~527^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a673b0568b3d6af51b963978b254f55712a79099;p=thirdparty%2Fsystemd.git

repart: Use copy_bytes() instead of copy_bytes_full()
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 46eda6bb081..94a87b97883 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -3200,7 +3200,7 @@ static int context_copy_blocks(Context *context) {
                 log_info("Copying in '%s' (%s) on block level into future partition %" PRIu64 ".",
                          p->copy_blocks_path, FORMAT_BYTES(p->copy_blocks_size), p->partno);
 
-                r = copy_bytes_full(p->copy_blocks_fd, target_fd, p->copy_blocks_size, 0, NULL, NULL, NULL, NULL);
+                r = copy_bytes(p->copy_blocks_fd, target_fd, p->copy_blocks_size, 0);
                 if (r < 0)
                         return log_error_errno(r, "Failed to copy in data from '%s': %m", p->copy_blocks_path);
 
@@ -4403,7 +4403,7 @@ static int context_split(Context *context) {
                 if (lseek(fd, p->offset, SEEK_SET) < 0)
                         return log_error_errno(errno, "Failed to seek to partition offset: %m");
 
-                r = copy_bytes_full(fd, fdt, p->new_size, COPY_REFLINK|COPY_HOLES, NULL, NULL, NULL, NULL);
+                r = copy_bytes(fd, fdt, p->new_size, COPY_REFLINK|COPY_HOLES);
                 if (r < 0)
                         return log_error_errno(r, "Failed to copy to split partition %s: %m", fname);
         }