shared: the btrfs quota field is called "referenced" not "referred"
This commit is contained in:
parent
e06fe15b1f
commit
cb81cd8073
|
@ -284,7 +284,7 @@ int tar_export_start(TarExport *e, const char *path, int fd, ImportCompressType
|
|||
|
||||
r = btrfs_subvol_get_quota_fd(sfd, &q);
|
||||
if (r >= 0)
|
||||
e->quota_referenced = q.referred;
|
||||
e->quota_referenced = q.referenced;
|
||||
|
||||
free(e->temp_path);
|
||||
e->temp_path = NULL;
|
||||
|
|
|
@ -76,7 +76,7 @@ static int property_get_pool_usage(
|
|||
BtrfsQuotaInfo q;
|
||||
|
||||
if (btrfs_subvol_get_quota_fd(fd, &q) >= 0)
|
||||
usage = q.referred;
|
||||
usage = q.referenced;
|
||||
}
|
||||
|
||||
if (stat("/var/lib/machines.raw", &st) >= 0) {
|
||||
|
@ -112,7 +112,7 @@ static int property_get_pool_limit(
|
|||
BtrfsQuotaInfo q;
|
||||
|
||||
if (btrfs_subvol_get_quota_fd(fd, &q) >= 0)
|
||||
size = q.referred_max;
|
||||
size = q.referenced_max;
|
||||
}
|
||||
|
||||
if (stat("/var/lib/machines.raw", &st) >= 0) {
|
||||
|
|
|
@ -599,7 +599,7 @@ int btrfs_subvol_get_quota_fd(int fd, BtrfsQuotaInfo *ret) {
|
|||
if (sh->type == BTRFS_QGROUP_INFO_KEY) {
|
||||
const struct btrfs_qgroup_info_item *qii = BTRFS_IOCTL_SEARCH_HEADER_BODY(sh);
|
||||
|
||||
ret->referred = le64toh(qii->rfer);
|
||||
ret->referenced = le64toh(qii->rfer);
|
||||
ret->exclusive = le64toh(qii->excl);
|
||||
|
||||
found_info = true;
|
||||
|
@ -607,11 +607,11 @@ int btrfs_subvol_get_quota_fd(int fd, BtrfsQuotaInfo *ret) {
|
|||
} else if (sh->type == BTRFS_QGROUP_LIMIT_KEY) {
|
||||
const struct btrfs_qgroup_limit_item *qli = BTRFS_IOCTL_SEARCH_HEADER_BODY(sh);
|
||||
|
||||
ret->referred_max = le64toh(qli->max_rfer);
|
||||
ret->referenced_max = le64toh(qli->max_rfer);
|
||||
ret->exclusive_max = le64toh(qli->max_excl);
|
||||
|
||||
if (ret->referred_max == 0)
|
||||
ret->referred_max = (uint64_t) -1;
|
||||
if (ret->referenced_max == 0)
|
||||
ret->referenced_max = (uint64_t) -1;
|
||||
if (ret->exclusive_max == 0)
|
||||
ret->exclusive_max = (uint64_t) -1;
|
||||
|
||||
|
@ -632,12 +632,12 @@ finish:
|
|||
return -ENODATA;
|
||||
|
||||
if (!found_info) {
|
||||
ret->referred = (uint64_t) -1;
|
||||
ret->referenced = (uint64_t) -1;
|
||||
ret->exclusive = (uint64_t) -1;
|
||||
}
|
||||
|
||||
if (!found_limit) {
|
||||
ret->referred_max = (uint64_t) -1;
|
||||
ret->referenced_max = (uint64_t) -1;
|
||||
ret->exclusive_max = (uint64_t) -1;
|
||||
}
|
||||
|
||||
|
@ -686,11 +686,11 @@ int btrfs_quota_enable(const char *path, bool b) {
|
|||
return btrfs_quota_enable_fd(fd, b);
|
||||
}
|
||||
|
||||
int btrfs_quota_limit_fd(int fd, uint64_t referred_max) {
|
||||
int btrfs_quota_limit_fd(int fd, uint64_t referenced_max) {
|
||||
struct btrfs_ioctl_qgroup_limit_args args = {
|
||||
.lim.max_rfer =
|
||||
referred_max == (uint64_t) -1 ? 0 :
|
||||
referred_max == 0 ? 1 : referred_max,
|
||||
referenced_max == (uint64_t) -1 ? 0 :
|
||||
referenced_max == 0 ? 1 : referenced_max,
|
||||
.lim.flags = BTRFS_QGROUP_LIMIT_MAX_RFER,
|
||||
};
|
||||
|
||||
|
@ -702,14 +702,14 @@ int btrfs_quota_limit_fd(int fd, uint64_t referred_max) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int btrfs_quota_limit(const char *path, uint64_t referred_max) {
|
||||
int btrfs_quota_limit(const char *path, uint64_t referenced_max) {
|
||||
_cleanup_close_ int fd = -1;
|
||||
|
||||
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
|
||||
if (fd < 0)
|
||||
return -errno;
|
||||
|
||||
return btrfs_quota_limit_fd(fd, referred_max);
|
||||
return btrfs_quota_limit_fd(fd, referenced_max);
|
||||
}
|
||||
|
||||
int btrfs_resize_loopback_fd(int fd, uint64_t new_size, bool grow_only) {
|
||||
|
|
|
@ -37,9 +37,9 @@ typedef struct BtrfsSubvolInfo {
|
|||
} BtrfsSubvolInfo;
|
||||
|
||||
typedef struct BtrfsQuotaInfo {
|
||||
uint64_t referred;
|
||||
uint64_t referenced;
|
||||
uint64_t exclusive;
|
||||
uint64_t referred_max;
|
||||
uint64_t referenced_max;
|
||||
uint64_t exclusive_max;
|
||||
} BtrfsQuotaInfo;
|
||||
|
||||
|
@ -71,8 +71,8 @@ int btrfs_defrag(const char *p);
|
|||
int btrfs_quota_enable_fd(int fd, bool b);
|
||||
int btrfs_quota_enable(const char *path, bool b);
|
||||
|
||||
int btrfs_quota_limit_fd(int fd, uint64_t referred_max);
|
||||
int btrfs_quota_limit(const char *path, uint64_t referred_max);
|
||||
int btrfs_quota_limit_fd(int fd, uint64_t referenced_max);
|
||||
int btrfs_quota_limit(const char *path, uint64_t referenced_max);
|
||||
|
||||
int btrfs_resize_loopback_fd(int fd, uint64_t size, bool grow_only);
|
||||
int btrfs_resize_loopback(const char *path, uint64_t size, bool grow_only);
|
||||
|
|
|
@ -163,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;
|
||||
}
|
||||
|
||||
|
@ -613,7 +613,7 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
|
|||
return 0;
|
||||
}
|
||||
|
||||
int image_set_limit(Image *i, uint64_t referred_max) {
|
||||
int image_set_limit(Image *i, uint64_t referenced_max) {
|
||||
assert(i);
|
||||
|
||||
if (path_equal(i->path, "/") ||
|
||||
|
@ -623,7 +623,7 @@ int image_set_limit(Image *i, uint64_t referred_max) {
|
|||
if (i->type != IMAGE_SUBVOLUME)
|
||||
return -ENOTSUP;
|
||||
|
||||
return btrfs_quota_limit(i->path, referred_max);
|
||||
return btrfs_quota_limit(i->path, referenced_max);
|
||||
}
|
||||
|
||||
int image_name_lock(const char *name, int operation, LockFile *ret) {
|
||||
|
|
|
@ -71,4 +71,4 @@ bool image_name_is_valid(const char *s) _pure_;
|
|||
int image_path_lock(const char *path, int operation, LockFile *global, LockFile *local);
|
||||
int image_name_lock(const char *name, int operation, LockFile *ret);
|
||||
|
||||
int image_set_limit(Image *i, uint64_t referred_max);
|
||||
int image_set_limit(Image *i, uint64_t referenced_max);
|
||||
|
|
|
@ -50,9 +50,9 @@ int main(int argc, char *argv[]) {
|
|||
if (r < 0)
|
||||
log_error_errno(r, "Failed to get quota info: %m");
|
||||
else {
|
||||
log_info("referred: %s", strna(format_bytes(bs, sizeof(bs), quota.referred)));
|
||||
log_info("referenced: %s", strna(format_bytes(bs, sizeof(bs), quota.referenced)));
|
||||
log_info("exclusive: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive)));
|
||||
log_info("referred_max: %s", strna(format_bytes(bs, sizeof(bs), quota.referred_max)));
|
||||
log_info("referenced_max: %s", strna(format_bytes(bs, sizeof(bs), quota.referenced_max)));
|
||||
log_info("exclusive_max: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive_max)));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue