chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: fix path_is_mount_point() for symlinks
[elogind.git]
/
src
/
shared
/
btrfs-util.c
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) {