Commit e979cf50 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: do not include cap/dentry releases in replayed messages 



Strip the cap and dentry releases from replayed messages.  They can
cause the shared state to get out of sync because they were generated
(with the request message) earlier, and no longer reflect the current
client state.

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

fs/ceph/mds_client.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1514,6 +1514,9 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, 
	ceph_encode_filepath(&p, end, ino1, path1);

	ceph_encode_filepath(&p, end, ino1, path1);

	ceph_encode_filepath(&p, end, ino2, path2);

	ceph_encode_filepath(&p, end, ino2, path2);





	/* make note of release offset, in case we need to replay */

	req->r_request_release_offset = p - msg->front.iov_base;



	/* cap releases */

	/* cap releases */

	releases = 0;

	releases = 0;

	if (req->r_inode_drop)

	if (req->r_inode_drop)
@@ -1598,6 +1601,11 @@ static int __prepare_send_request(struct ceph_mds_client *mdsc, 
			rhead->ino = cpu_to_le64(ceph_ino(req->r_target_inode));

			rhead->ino = cpu_to_le64(ceph_ino(req->r_target_inode));





		rhead->num_retry = req->r_attempts - 1;

		rhead->num_retry = req->r_attempts - 1;



		/* remove cap/dentry releases from message */

		rhead->num_releases = 0;

		msg->hdr.front_len = cpu_to_le32(req->r_request_release_offset);

		msg->front.iov_len = req->r_request_release_offset;

		return 0;

		return 0;

	}

	}

fs/ceph/mds_client.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ struct ceph_mds_request { 
	int r_old_inode_drop, r_old_inode_unless;

	int r_old_inode_drop, r_old_inode_unless;





	struct ceph_msg  *r_request;  /* original request */

	struct ceph_msg  *r_request;  /* original request */

	int r_request_release_offset;

	struct ceph_msg  *r_reply;

	struct ceph_msg  *r_reply;

	struct ceph_mds_reply_info_parsed r_reply_info;

	struct ceph_mds_reply_info_parsed r_reply_info;

	int r_err;

	int r_err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE