summaryrefslogtreecommitdiff
path: root/src/import
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-21 19:45:44 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-22 01:59:25 +0200
commit8c9cfc28448bf671807e7d96b580221edebd71da (patch)
treedb54c559ae82adf23797badf5829d3882933b71b /src/import
parent5bcd08db289cd02aad8a89b37b2a46244a7bd473 (diff)
import: when downloading images, create a subtree quota group for them
Diffstat (limited to 'src/import')
-rw-r--r--src/import/import-tar.c2
-rw-r--r--src/import/pull-dkr.c2
-rw-r--r--src/import/pull-tar.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index d2bfb30238..5c288d438e 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -235,6 +235,8 @@ static int tar_import_fork_tar(TarImport *i) {
return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path);
} else if (r < 0)
return log_error_errno(errno, "Failed to create subvolume %s: %m", i->temp_path);
+ else
+ (void) import_assign_pool_quota_and_warn(i->temp_path);
i->tar_fd = import_fork_tar_x(i->temp_path, &i->tar_pid);
if (i->tar_fd < 0)
diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index b77f3e47f1..84211d282b 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -543,6 +543,8 @@ 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);
+ (void) import_assign_pool_quota_and_warn(i->temp_path);
+
j->disk_fd = import_fork_tar_x(i->temp_path, &i->tar_pid);
if (j->disk_fd < 0)
return j->disk_fd;
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 563765d83d..b818382172 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -410,6 +410,8 @@ static int tar_pull_job_on_open_disk_tar(PullJob *j) {
return log_error_errno(errno, "Failed to create directory %s: %m", i->temp_path);
} else if (r < 0)
return log_error_errno(errno, "Failed to create subvolume %s: %m", i->temp_path);
+ else
+ (void) import_assign_pool_quota_and_warn(i->temp_path);
j->disk_fd = import_fork_tar_x(i->temp_path, &i->tar_pid);
if (j->disk_fd < 0)