Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/ceph/caps.c

+10 −12
Original line number Diff line number Diff line
@@ -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,

				     ceph_cap_string(cap->issued),

				     ceph_cap_string(cap->issued & ~drop));

				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",

				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->mds_wanted),

					     ceph_cap_string(cap->mds_wanted &

							     ~wanted),

				     ceph_cap_string(wanted));

					cap->mds_wanted &= wanted;

				}



				cap->issued &= ~drop;

				cap->implemented &= ~drop;

				cap->mds_wanted = wanted;

			} else {

				dout("encode_inode_release %p cap %p %s"

				     " (force)\n", inode, cap,