summaryrefslogtreecommitdiffstats
path: root/src/import/export-tar.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-03 16:35:44 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-03 16:36:19 +0100
commit7950211df3e327ba2324e8bca45c1444a25a6f16 (patch)
tree53e249d270441765a484e368cd9dee8f506ada79 /src/import/export-tar.c
parenttree-wide: port various places to use TAKE_PID() (diff)
downloadsystemd-7950211df3e327ba2324e8bca45c1444a25a6f16.tar.xz
systemd-7950211df3e327ba2324e8bca45c1444a25a6f16.zip
tree-wide: port more code to sigkill_wait()
Diffstat (limited to 'src/import/export-tar.c')
-rw-r--r--src/import/export-tar.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 6dc2e01733..78f0a7ca75 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -56,10 +56,8 @@ TarExport *tar_export_unref(TarExport *e) {
sd_event_source_unref(e->output_event_source);
- if (e->tar_pid > 1) {
- (void) kill_and_sigcont(e->tar_pid, SIGKILL);
- (void) wait_for_terminate(e->tar_pid, NULL);
- }
+ if (e->tar_pid > 1)
+ sigkill_wait(e->tar_pid);
if (e->temp_path) {
(void) btrfs_subvol_remove(e->temp_path, BTRFS_REMOVE_QUOTA);