RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26104 into master

Browse Source 
* refs/pull/26104/head:
	client/Client: change dir's size delta to current write file size delta

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-07-12 17:18:02 -07:00
commit a62783a264
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/Client.cc
View File

@ -14069,16 +14069,16 @@ bool Client::is_quota_bytes_exceeded(Inode *in, int64_t new_bytes,
bool Client::is_quota_bytes_approaching(Inode *in, const UserPerm& perms)
{
ceph_assert(in->size >= in->reported_size);
const uint64_t size = in->size - in->reported_size;
return check_quota_condition(in, perms,
[](const Inode &in) {
[&size](const Inode &in) {
if (in.quota.max_bytes) {
if (in.rstat.rbytes >= in.quota.max_bytes) {
return true;
}
ceph_assert(in.size >= in.reported_size);
const uint64_t space = in.quota.max_bytes - in.rstat.rbytes;
const uint64_t size = in.size - in.reported_size;
return (space >> 4) < size;
} else {
return false;