hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph: fix root quota realm check 

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Yan, Zheng 2018-01-12 16:55:31 +08:00 committed by Ilya Dryomov
parent 2596366907
commit 0eb6bbe4d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ceph/quota.c
View File

@ -85,6 +85,7 @@ static struct ceph_snap_realm *get_quota_realm(struct ceph_mds_client *mdsc,
struct ceph_snap_realm *realm, *next; struct ceph_snap_realm *realm, *next;
struct ceph_vino vino; struct ceph_vino vino;
struct inode *in; struct inode *in;
bool has_quota;
if (ceph_snap(inode) != CEPH_NOSNAP) if (ceph_snap(inode) != CEPH_NOSNAP)
return NULL; return NULL;
@ -104,12 +105,13 @@ static struct ceph_snap_realm *get_quota_realm(struct ceph_mds_client *mdsc,
break; break;
} }
ci = ceph_inode(in); ci = ceph_inode(in);
if (ceph_has_quota(ci) || (ci->i_vino.ino == CEPH_INO_ROOT)) { has_quota = ceph_has_quota(ci);
iput(in);
return realm;
}
iput(in); iput(in);
next = realm->parent; next = realm->parent;
if (has_quota || !next)
return realm;
ceph_get_snap_realm(mdsc, next); ceph_get_snap_realm(mdsc, next);
ceph_put_snap_realm(mdsc, realm); ceph_put_snap_realm(mdsc, realm);
realm = next; realm = next;
@ -162,7 +164,6 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
struct ceph_vino vino; struct ceph_vino vino;
struct inode *in; struct inode *in;
u64 max, rvalue; u64 max, rvalue;
bool is_root;
bool exceeded = false; bool exceeded = false;
if (ceph_snap(inode) != CEPH_NOSNAP) if (ceph_snap(inode) != CEPH_NOSNAP)
@ -192,7 +193,6 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
max = ci->i_max_bytes; max = ci->i_max_bytes;
rvalue = ci->i_rbytes; rvalue = ci->i_rbytes;
} }
is_root = (ci->i_vino.ino == CEPH_INO_ROOT);
spin_unlock(&ci->i_ceph_lock); spin_unlock(&ci->i_ceph_lock);
switch (op) { switch (op) {
case QUOTA_CHECK_MAX_FILES_OP: case QUOTA_CHECK_MAX_FILES_OP:
@ -222,9 +222,9 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
} }
iput(in); iput(in);
if (is_root || exceeded)
break;
next = realm->parent; next = realm->parent;
if (exceeded || !next)
break;
ceph_get_snap_realm(mdsc, next); ceph_get_snap_realm(mdsc, next);
ceph_put_snap_realm(mdsc, realm); ceph_put_snap_realm(mdsc, realm);
realm = next; realm = next;