chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: use _cleanup_close_pair_ where appropriate
[elogind.git]
/
src
/
import
/
pull-dkr.c
diff --git
a/src/import/pull-dkr.c
b/src/import/pull-dkr.c
index ecbf8063ce15836cfd3d41a11074de35e832a556..1a7dc310cba82563e9bfe068cc37610e163fa730 100644
(file)
--- a/
src/import/pull-dkr.c
+++ b/
src/import/pull-dkr.c
@@
-34,6
+34,7
@@
#include "aufs-util.h"
#include "pull-job.h"
#include "pull-common.h"
#include "aufs-util.h"
#include "pull-job.h"
#include "pull-common.h"
+#include "import-common.h"
#include "pull-dkr.h"
typedef enum DkrProgress {
#include "pull-dkr.h"
typedef enum DkrProgress {
@@
-491,7
+492,7
@@
static int dkr_pull_job_on_open_disk(PullJob *j) {
if (r < 0)
return log_error_errno(r, "Failed to make btrfs subvolume %s: %m", i->temp_path);
if (r < 0)
return log_error_errno(r, "Failed to make btrfs subvolume %s: %m", i->temp_path);
- j->disk_fd =
pull_fork_tar
(i->temp_path, &i->tar_pid);
+ j->disk_fd =
import_fork_tar_x
(i->temp_path, &i->tar_pid);
if (j->disk_fd < 0)
return j->disk_fd;
if (j->disk_fd < 0)
return j->disk_fd;