chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e06fe15
)
shared: the btrfs quota field is called "referenced" not "referred"
author
Lennart Poettering
<lennart@poettering.net>
Tue, 10 Mar 2015 14:55:58 +0000
(15:55 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 10 Mar 2015 14:55:58 +0000
(15:55 +0100)
src/import/export-tar.c
patch
|
blob
|
history
src/machine/machined-dbus.c
patch
|
blob
|
history
src/shared/btrfs-util.c
patch
|
blob
|
history
src/shared/btrfs-util.h
patch
|
blob
|
history
src/shared/machine-image.c
patch
|
blob
|
history
src/shared/machine-image.h
patch
|
blob
|
history
src/test/test-btrfs.c
patch
|
blob
|
history
diff --git
a/src/import/export-tar.c
b/src/import/export-tar.c
index 80de83896b028d02f7688fbef612563aa4581d36..c27bab46b0be5d3064c0c15e0a255762ec47fc8e 100644
(file)
--- a/
src/import/export-tar.c
+++ b/
src/import/export-tar.c
@@
-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)
r = btrfs_subvol_get_quota_fd(sfd, &q);
if (r >= 0)
- e->quota_referenced = q.refer
r
ed;
+ e->quota_referenced = q.refer
enc
ed;
free(e->temp_path);
e->temp_path = NULL;
free(e->temp_path);
e->temp_path = NULL;
diff --git
a/src/machine/machined-dbus.c
b/src/machine/machined-dbus.c
index adba8122f3a37b5bb28747b9c7410584d2c3f0e8..4d7409321b26b9efeb0a932b923ccdcf13f5ed3b 100644
(file)
--- a/
src/machine/machined-dbus.c
+++ b/
src/machine/machined-dbus.c
@@
-76,7
+76,7
@@
static int property_get_pool_usage(
BtrfsQuotaInfo q;
if (btrfs_subvol_get_quota_fd(fd, &q) >= 0)
BtrfsQuotaInfo q;
if (btrfs_subvol_get_quota_fd(fd, &q) >= 0)
- usage = q.refer
r
ed;
+ usage = q.refer
enc
ed;
}
if (stat("/var/lib/machines.raw", &st) >= 0) {
}
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)
BtrfsQuotaInfo q;
if (btrfs_subvol_get_quota_fd(fd, &q) >= 0)
- size = q.refer
r
ed_max;
+ size = q.refer
enc
ed_max;
}
if (stat("/var/lib/machines.raw", &st) >= 0) {
}
if (stat("/var/lib/machines.raw", &st) >= 0) {
diff --git
a/src/shared/btrfs-util.c
b/src/shared/btrfs-util.c
index 23a22db662528b50080e96a9c2d857305c1c9378..62b1eff6aecdfa36dfaf620d06b34ee2e6b4b8fd 100644
(file)
--- a/
src/shared/btrfs-util.c
+++ b/
src/shared/btrfs-util.c
@@
-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);
if (sh->type == BTRFS_QGROUP_INFO_KEY) {
const struct btrfs_qgroup_info_item *qii = BTRFS_IOCTL_SEARCH_HEADER_BODY(sh);
- ret->refer
r
ed = le64toh(qii->rfer);
+ ret->refer
enc
ed = le64toh(qii->rfer);
ret->exclusive = le64toh(qii->excl);
found_info = true;
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);
} else if (sh->type == BTRFS_QGROUP_LIMIT_KEY) {
const struct btrfs_qgroup_limit_item *qli = BTRFS_IOCTL_SEARCH_HEADER_BODY(sh);
- ret->refer
r
ed_max = le64toh(qli->max_rfer);
+ ret->refer
enc
ed_max = le64toh(qli->max_rfer);
ret->exclusive_max = le64toh(qli->max_excl);
ret->exclusive_max = le64toh(qli->max_excl);
- if (ret->refer
r
ed_max == 0)
- ret->refer
r
ed_max = (uint64_t) -1;
+ if (ret->refer
enc
ed_max == 0)
+ ret->refer
enc
ed_max = (uint64_t) -1;
if (ret->exclusive_max == 0)
ret->exclusive_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) {
return -ENODATA;
if (!found_info) {
- ret->refer
r
ed = (uint64_t) -1;
+ ret->refer
enc
ed = (uint64_t) -1;
ret->exclusive = (uint64_t) -1;
}
if (!found_limit) {
ret->exclusive = (uint64_t) -1;
}
if (!found_limit) {
- ret->refer
r
ed_max = (uint64_t) -1;
+ ret->refer
enc
ed_max = (uint64_t) -1;
ret->exclusive_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);
}
return btrfs_quota_enable_fd(fd, b);
}
-int btrfs_quota_limit_fd(int fd, uint64_t refer
r
ed_max) {
+int btrfs_quota_limit_fd(int fd, uint64_t refer
enc
ed_max) {
struct btrfs_ioctl_qgroup_limit_args args = {
.lim.max_rfer =
struct btrfs_ioctl_qgroup_limit_args args = {
.lim.max_rfer =
- refer
r
ed_max == (uint64_t) -1 ? 0 :
- refer
red_max == 0 ? 1 : referr
ed_max,
+ refer
enc
ed_max == (uint64_t) -1 ? 0 :
+ refer
enced_max == 0 ? 1 : referenc
ed_max,
.lim.flags = BTRFS_QGROUP_LIMIT_MAX_RFER,
};
.lim.flags = BTRFS_QGROUP_LIMIT_MAX_RFER,
};
@@
-702,14
+702,14
@@
int btrfs_quota_limit_fd(int fd, uint64_t referred_max) {
return 0;
}
return 0;
}
-int btrfs_quota_limit(const char *path, uint64_t refer
r
ed_max) {
+int btrfs_quota_limit(const char *path, uint64_t refer
enc
ed_max) {
_cleanup_close_ int fd = -1;
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
if (fd < 0)
return -errno;
_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, refer
r
ed_max);
+ return btrfs_quota_limit_fd(fd, refer
enc
ed_max);
}
int btrfs_resize_loopback_fd(int fd, uint64_t new_size, bool grow_only) {
}
int btrfs_resize_loopback_fd(int fd, uint64_t new_size, bool grow_only) {
diff --git
a/src/shared/btrfs-util.h
b/src/shared/btrfs-util.h
index cb85b71d74e08e68d0782d12f2dc0cc348fed827..9685723433ab781de092efc6f821f9c0c5270672 100644
(file)
--- a/
src/shared/btrfs-util.h
+++ b/
src/shared/btrfs-util.h
@@
-37,9
+37,9
@@
typedef struct BtrfsSubvolInfo {
} BtrfsSubvolInfo;
typedef struct BtrfsQuotaInfo {
} BtrfsSubvolInfo;
typedef struct BtrfsQuotaInfo {
- uint64_t refer
r
ed;
+ uint64_t refer
enc
ed;
uint64_t exclusive;
uint64_t exclusive;
- uint64_t refer
r
ed_max;
+ uint64_t refer
enc
ed_max;
uint64_t exclusive_max;
} BtrfsQuotaInfo;
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_enable_fd(int fd, bool b);
int btrfs_quota_enable(const char *path, bool b);
-int btrfs_quota_limit_fd(int fd, uint64_t refer
r
ed_max);
-int btrfs_quota_limit(const char *path, uint64_t refer
r
ed_max);
+int btrfs_quota_limit_fd(int fd, uint64_t refer
enc
ed_max);
+int btrfs_quota_limit(const char *path, uint64_t refer
enc
ed_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);
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);
diff --git
a/src/shared/machine-image.c
b/src/shared/machine-image.c
index c6d2850ad2dcf9d901f3dce0f5ffe4d6b1a1e4f3..552847e0f0119890255d3244629dcecd3cbd8d41 100644
(file)
--- a/
src/shared/machine-image.c
+++ b/
src/shared/machine-image.c
@@
-163,10
+163,10
@@
static int image_make(
r = btrfs_subvol_get_quota_fd(fd, "a);
if (r >= 0) {
r = btrfs_subvol_get_quota_fd(fd, "a);
if (r >= 0) {
- (*ret)->usage = quota.refer
r
ed;
+ (*ret)->usage = quota.refer
enc
ed;
(*ret)->usage_exclusive = quota.exclusive;
(*ret)->usage_exclusive = quota.exclusive;
- (*ret)->limit = quota.refer
r
ed_max;
+ (*ret)->limit = quota.refer
enc
ed_max;
(*ret)->limit_exclusive = quota.exclusive_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;
}
return 0;
}
-int image_set_limit(Image *i, uint64_t refer
r
ed_max) {
+int image_set_limit(Image *i, uint64_t refer
enc
ed_max) {
assert(i);
if (path_equal(i->path, "/") ||
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;
if (i->type != IMAGE_SUBVOLUME)
return -ENOTSUP;
- return btrfs_quota_limit(i->path, refer
r
ed_max);
+ return btrfs_quota_limit(i->path, refer
enc
ed_max);
}
int image_name_lock(const char *name, int operation, LockFile *ret) {
}
int image_name_lock(const char *name, int operation, LockFile *ret) {
diff --git
a/src/shared/machine-image.h
b/src/shared/machine-image.h
index df2394991f1b9bfc79ef0fb8c9fc9b718fd3a498..bf41b2e78596d0dcea2009b52363db8ae654e7f4 100644
(file)
--- a/
src/shared/machine-image.h
+++ b/
src/shared/machine-image.h
@@
-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_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 refer
r
ed_max);
+int image_set_limit(Image *i, uint64_t refer
enc
ed_max);
diff --git
a/src/test/test-btrfs.c
b/src/test/test-btrfs.c
index c49b83217963f9f66e021d9174ad05277bf1e45d..9e6538e7352972f65c5135ec26d1fb7f8e36e241 100644
(file)
--- a/
src/test/test-btrfs.c
+++ b/
src/test/test-btrfs.c
@@
-50,9
+50,9
@@
int main(int argc, char *argv[]) {
if (r < 0)
log_error_errno(r, "Failed to get quota info: %m");
else {
if (r < 0)
log_error_errno(r, "Failed to get quota info: %m");
else {
- log_info("refer
red: %s", strna(format_bytes(bs, sizeof(bs), quota.referr
ed)));
+ log_info("refer
enced: %s", strna(format_bytes(bs, sizeof(bs), quota.referenc
ed)));
log_info("exclusive: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive)));
log_info("exclusive: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive)));
- log_info("refer
red_max: %s", strna(format_bytes(bs, sizeof(bs), quota.referr
ed_max)));
+ log_info("refer
enced_max: %s", strna(format_bytes(bs, sizeof(bs), quota.referenc
ed_max)));
log_info("exclusive_max: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive_max)));
}
log_info("exclusive_max: %s", strna(format_bytes(bs, sizeof(bs), quota.exclusive_max)));
}