RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 17:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: fix the cross-quota rename boundary check conditions

Browse Source 
We were previously rejecting a rename if either of the involved directories
was a quota root, even if the other directory was part of the same quota
"tree". What we really want to do is identify the correct quota root
(whether local or ancestral) for each directory and compare them. So
now we do.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Greg Farnum 2016-12-14 12:09:44 -08:00
parent 93d7a21e42
commit 8e8892aa46
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/Client.cc
View File

@ -11524,11 +11524,14 @@ int Client::_rename(Inode *fromdir, const char *fromname, Inode *todir, const ch
return -EROFS;
}
if (cct->_conf->client_quota &&
fromdir != todir &&
(fromdir->quota.is_enable() ||
todir->quota.is_enable() ||
get_quota_root(fromdir, perm) != get_quota_root(todir, perm))) {
return -EXDEV;
fromdir != todir) {
Inode *fromdir_root =
fromdir->quota.is_enable() ? fromdir : get_quota_root(fromdir, perm);
Inode *todir_root =
todir->quota.is_enable() ? todir : get_quota_root(todir, perm);
if (fromdir_root != todir_root) {
return -EXDEV;
}
}
InodeRef target;