diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-13 21:51:11 +0100 |
---|---|---|
committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-14 12:51:40 +0100 |
commit | c17cfe6ef7bc1ac4501b5f6e7d4f4efc08aef439 (patch) | |
tree | 5ec271d10ba3d521e8b2694e139ef6814b1142cd /src/import | |
parent | a4d2461c46f40c9ae5002a2aea35b35ccb60ef9c (diff) | |
download | systemd-c17cfe6ef7bc1ac4501b5f6e7d4f4efc08aef439.tar.gz |
copy: Make copy_xattr() more generic
Let's make copy_xattr() a little more generic in preparation for
copying symlink xattrs.
Diffstat (limited to 'src/import')
-rw-r--r-- | src/import/export-raw.c | 2 | ||||
-rw-r--r-- | src/import/import-raw.c | 2 | ||||
-rw-r--r-- | src/import/pull-raw.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/import/export-raw.c b/src/import/export-raw.c index 7c61aef3b6..44181fd9b2 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -216,7 +216,7 @@ static int raw_export_process(RawExport *e) { finish: if (r >= 0) { (void) copy_times(e->input_fd, e->output_fd, COPY_CRTIME); - (void) copy_xattr(e->input_fd, e->output_fd, 0); + (void) copy_xattr(e->input_fd, NULL, e->output_fd, NULL, 0); } if (e->on_finished) diff --git a/src/import/import-raw.c b/src/import/import-raw.c index 5d4dedf66d..3765b514bb 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -234,7 +234,7 @@ static int raw_import_finish(RawImport *i) { if (S_ISREG(i->input_stat.st_mode)) { (void) copy_times(i->input_fd, i->output_fd, COPY_CRTIME); - (void) copy_xattr(i->input_fd, i->output_fd, 0); + (void) copy_xattr(i->input_fd, NULL, i->output_fd, NULL, 0); } } diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index a4a844bf07..8a152d0f6f 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -396,7 +396,7 @@ static int raw_pull_make_local_copy(RawPull *i) { return log_error_errno(r, "Failed to make writable copy of image: %m"); (void) copy_times(i->raw_job->disk_fd, dfd, COPY_CRTIME); - (void) copy_xattr(i->raw_job->disk_fd, dfd, 0); + (void) copy_xattr(i->raw_job->disk_fd, NULL, dfd, NULL, 0); dfd = safe_close(dfd); |