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

Commit 68c28323 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: do not retain caps that are being revoked 



Never retain caps in __send_cap() that are being revoked.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent cbd03635

fs/ceph/caps.c

+6 −4
Original line number Diff line number Diff line
@@ -1042,10 +1042,7 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, 
	struct ceph_inode_info *ci = cap->ci;

	struct inode *inode = &ci->vfs_inode;

	u64 cap_id = cap->cap_id;

	int held = cap->issued | cap->implemented;

	int revoking = cap->implemented & ~cap->issued;

	int dropping = cap->issued & ~retain;

	int keep;

	int held, revoking, dropping, keep;

	u64 seq, issue_seq, mseq, time_warp_seq, follows;

	u64 size, max_size;

	struct timespec mtime, atime;
@@ -1060,6 +1057,11 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap, 
	int i;

	int ret;



	held = cap->issued | cap->implemented;

	revoking = cap->implemented & ~cap->issued;

	retain &= ~revoking;

	dropping = cap->issued & ~retain;



	dout("__send_cap %p cap %p session %p %s -> %s (revoking %s)\n",

	     inode, cap, cap->session,

	     ceph_cap_string(held), ceph_cap_string(held & retain),