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

ceph: fix cap release race

ceph_encode_inode_release() can race with ceph_open() and release
caps wanted by open files. So it should call __ceph_caps_wanted()
to get the wanted caps.
Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent ccca4e37
...@@ -3042,21 +3042,19 @@ int ceph_encode_inode_release(void **p, struct inode *inode, ...@@ -3042,21 +3042,19 @@ int ceph_encode_inode_release(void **p, struct inode *inode,
(cap->issued & unless) == 0)) { (cap->issued & unless) == 0)) {
if ((cap->issued & drop) && if ((cap->issued & drop) &&
(cap->issued & unless) == 0) { (cap->issued & unless) == 0) {
dout("encode_inode_release %p cap %p %s -> " int wanted = __ceph_caps_wanted(ci);
"%s\n", inode, cap, if ((ci->i_ceph_flags & CEPH_I_NODELAY) == 0)
wanted |= cap->mds_wanted;
dout("encode_inode_release %p cap %p "
"%s -> %s, wanted %s -> %s\n", inode, cap,
ceph_cap_string(cap->issued), ceph_cap_string(cap->issued),
ceph_cap_string(cap->issued & ~drop)); ceph_cap_string(cap->issued & ~drop),
ceph_cap_string(cap->mds_wanted),
ceph_cap_string(wanted));
cap->issued &= ~drop; cap->issued &= ~drop;
cap->implemented &= ~drop; cap->implemented &= ~drop;
if (ci->i_ceph_flags & CEPH_I_NODELAY) { cap->mds_wanted = wanted;
int wanted = __ceph_caps_wanted(ci);
dout(" wanted %s -> %s (act %s)\n",
ceph_cap_string(cap->mds_wanted),
ceph_cap_string(cap->mds_wanted &
~wanted),
ceph_cap_string(wanted));
cap->mds_wanted &= wanted;
}
} else { } else {
dout("encode_inode_release %p cap %p %s" dout("encode_inode_release %p cap %p %s"
" (force)\n", inode, cap, " (force)\n", inode, cap,
......
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