X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fmachine-image.c;h=edf986d4db11801abb0ca47c79b8003793189f3a;hb=33c2ce7b200747c172d4899c717a8e9097d84659;hp=8ea61052bd74c5f5a68d1b14d88c06b3390073ac;hpb=c19de71113f956809995fc68817e055e9f61f607;p=elogind.git diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c index 8ea61052b..edf986d4d 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -23,7 +23,6 @@ #include #include -#include "strv.h" #include "utf8.h" #include "btrfs-util.h" #include "path-util.h" @@ -164,10 +163,10 @@ static int image_make( r = btrfs_subvol_get_quota_fd(fd, "a); if (r >= 0) { - (*ret)->usage = quota.referred; + (*ret)->usage = quota.referenced; (*ret)->usage_exclusive = quota.exclusive; - (*ret)->limit = quota.referred_max; + (*ret)->limit = quota.referenced_max; (*ret)->limit_exclusive = quota.exclusive_max; } @@ -370,7 +369,7 @@ int image_remove(Image *i) { return rm_rf_dangerous(i->path, false, true, false); default: - return -ENOTSUP; + return -EOPNOTSUPP; } } @@ -425,13 +424,13 @@ int image_rename(Image *i, const char *new_name) { case IMAGE_RAW: { const char *fn; - fn = strappenda(new_name, ".raw"); + fn = strjoina(new_name, ".raw"); new_path = file_in_same_dir(i->path, fn); break; } default: - return -ENOTSUP; + return -EOPNOTSUPP; } if (!new_path) @@ -441,8 +440,9 @@ int image_rename(Image *i, const char *new_name) { if (!nn) return -ENOMEM; - if (renameat2(AT_FDCWD, i->path, AT_FDCWD, new_path, RENAME_NOREPLACE) < 0) - return -errno; + r = rename_noreplace(AT_FDCWD, i->path, AT_FDCWD, new_path); + if (r < 0) + return r; /* Restore the immutable bit, if it was set before */ if (file_attr & FS_IMMUTABLE_FL) @@ -486,19 +486,19 @@ int image_clone(Image *i, const char *new_name, bool read_only) { case IMAGE_SUBVOLUME: case IMAGE_DIRECTORY: - new_path = strappenda("/var/lib/machines/", new_name); + new_path = strjoina("/var/lib/machines/", new_name); r = btrfs_subvol_snapshot(i->path, new_path, read_only, true); break; case IMAGE_RAW: - new_path = strappenda("/var/lib/machines/", new_name, ".raw"); + new_path = strjoina("/var/lib/machines/", new_name, ".raw"); r = copy_file_atomic(i->path, new_path, read_only ? 0444 : 0644, false, FS_NOCOW_FL); break; default: - return -ENOTSUP; + return -EOPNOTSUPP; } if (r < 0) @@ -563,7 +563,7 @@ int image_read_only(Image *i, bool b) { } default: - return -ENOTSUP; + return -EOPNOTSUPP; } return 0; @@ -614,6 +614,19 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile return 0; } +int image_set_limit(Image *i, uint64_t referenced_max) { + assert(i); + + if (path_equal(i->path, "/") || + path_startswith(i->path, "/usr")) + return -EROFS; + + if (i->type != IMAGE_SUBVOLUME) + return -EOPNOTSUPP; + + return btrfs_quota_limit(i->path, referenced_max); +} + int image_name_lock(const char *name, int operation, LockFile *ret) { const char *p; @@ -629,7 +642,7 @@ int image_name_lock(const char *name, int operation, LockFile *ret) { return -EBUSY; mkdir_p("/run/systemd/nspawn/locks", 0600); - p = strappenda("/run/systemd/nspawn/locks/name-", name); + p = strjoina("/run/systemd/nspawn/locks/name-", name); return make_lock_file(p, operation, ret); }