Commit 6ee6b953 authored by Yan, Zheng's avatar Yan, Zheng Committed by Sage Weil

ceph: fix race between cap issue and revoke

If we receive new caps from the auth MDS and the non-auth MDS is
revoking the newly issued caps, we should release the caps from
the non-auth MDS. The scenario is filelock's state changes from
SYNC to LOCK. Non-auth MDS revokes Fc cap, the client gets Fc cap
from the auth MDS at the same time.
Signed-off-by: default avatarYan, Zheng <>
Reviewed-by: default avatarSage Weil <>
parent b1530f57
......@@ -806,22 +806,28 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)
* Return true if mask caps are currently being revoked by an MDS.
int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)
int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
struct ceph_cap *ocap, int mask)
struct inode *inode = &ci->vfs_inode;
struct ceph_cap *cap;
struct rb_node *p;
int ret = 0;
for (p = rb_first(&ci->i_caps); p; p = rb_next(p)) {
cap = rb_entry(p, struct ceph_cap, ci_node);
if (__cap_is_valid(cap) &&
(cap->implemented & ~cap->issued & mask)) {
ret = 1;
if (cap != ocap && __cap_is_valid(cap) &&
(cap->implemented & ~cap->issued & mask))
return 1;
return 0;
int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)
struct inode *inode = &ci->vfs_inode;
int ret;
ret = __ceph_caps_revoking_other(ci, NULL, mask);
dout("ceph_caps_revoking %p %s = %d\n", inode,
ceph_cap_string(mask), ret);
......@@ -2488,6 +2494,11 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
} else {
dout("grant: %s -> %s\n", ceph_cap_string(cap->issued),
/* non-auth MDS is revoking the newly grant caps ? */
if (cap == ci->i_auth_cap &&
__ceph_caps_revoking_other(ci, cap, newcaps))
check_caps = 2;
cap->issued = newcaps;
cap->implemented |= newcaps; /* add bits only, to
* avoid stepping on a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment