diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
| commit | 952b4473bc392652b1d4c9dae5ec88fd003c4e1d (patch) | |
| tree | 8d27afa9b27ceb997013868f2b80a4bb5a993911 /src/import/pull-common.c | |
| parent | c9fc270e462bf2f4eab963bf71234d64b0c4c30f (diff) | |
| parent | b0830e21f47109d8a6ba2fc0afbf9b2ca1ffc2a9 (diff) | |
Merge pull request #1641 from poettering/btrfs-quota
btrfs quota beef up and various other unrelated changes
Diffstat (limited to 'src/import/pull-common.c')
| -rw-r--r-- | src/import/pull-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 1ddb48e03f..edebb91556 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -138,7 +138,7 @@ int pull_make_local_copy(const char *final, const char *image_root, const char * if (force_local) (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME); - r = btrfs_subvol_snapshot(final, p, 0); + r = btrfs_subvol_snapshot(final, p, BTRFS_SNAPSHOT_QUOTA); if (r == -ENOTTY) { r = copy_tree(final, p, false); if (r < 0) @@ -366,9 +366,10 @@ int pull_verify(PullJob *main_job, log_info("SHA256 checksum of %s is valid.", main_job->url); - assert(!settings_job || settings_job->state == PULL_JOB_DONE); + assert(!settings_job || IN_SET(settings_job->state, PULL_JOB_DONE, PULL_JOB_FAILED)); if (settings_job && + settings_job->state == PULL_JOB_DONE && settings_job->error == 0 && !settings_job->etag_exists) { |