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: Yan, Zheng <zheng.z.yan@intel.com> Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
parent
ccca4e37b1
commit
bb137f84d1
@ -3042,21 +3042,19 @@ int ceph_encode_inode_release(void **p, struct inode *inode,
|
||||
(cap->issued & unless) == 0)) {
|
||||
if ((cap->issued & drop) &&
|
||||
(cap->issued & unless) == 0) {
|
||||
dout("encode_inode_release %p cap %p %s -> "
|
||||
"%s\n", inode, cap,
|
||||
int wanted = __ceph_caps_wanted(ci);
|
||||
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 & ~drop));
|
||||
ceph_cap_string(cap->issued & ~drop),
|
||||
ceph_cap_string(cap->mds_wanted),
|
||||
ceph_cap_string(wanted));
|
||||
|
||||
cap->issued &= ~drop;
|
||||
cap->implemented &= ~drop;
|
||||
if (ci->i_ceph_flags & CEPH_I_NODELAY) {
|
||||
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;
|
||||
}
|
||||
cap->mds_wanted = wanted;
|
||||
} else {
|
||||
dout("encode_inode_release %p cap %p %s"
|
||||
" (force)\n", inode, cap,
|
||||
|
Loading…
Reference in New Issue
Block a user