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

Commit 080af17e authored by Sage Weil's avatar Sage Weil
Browse files

ceph: remove bogus mds forward warning 



The must_resend flag is always true, not false.  In any case, we can
just ignore it anyway.

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

fs/ceph/mds_client.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -1899,7 +1899,6 @@ static void handle_forward(struct ceph_mds_client *mdsc, 
	u64 tid = le64_to_cpu(msg->hdr.tid);

	u64 tid = le64_to_cpu(msg->hdr.tid);

	u32 next_mds;

	u32 next_mds;

	u32 fwd_seq;

	u32 fwd_seq;

	u8 must_resend;

	int err = -EINVAL;

	int err = -EINVAL;

	void *p = msg->front.iov_base;

	void *p = msg->front.iov_base;

	void *end = p + msg->front.iov_len;

	void *end = p + msg->front.iov_len;
@@ -1907,14 +1906,11 @@ static void handle_forward(struct ceph_mds_client *mdsc, 
	ceph_decode_need(&p, end, 2*sizeof(u32), bad);

	ceph_decode_need(&p, end, 2*sizeof(u32), bad);

	next_mds = ceph_decode_32(&p);

	next_mds = ceph_decode_32(&p);

	fwd_seq = ceph_decode_32(&p);

	fwd_seq = ceph_decode_32(&p);

	must_resend = ceph_decode_8(&p);



	WARN_ON(must_resend);  /* shouldn't happen. */





	mutex_lock(&mdsc->mutex);

	mutex_lock(&mdsc->mutex);

	req = __lookup_request(mdsc, tid);

	req = __lookup_request(mdsc, tid);

	if (!req) {

	if (!req) {

		dout("forward %llu dne\n", tid);

		dout("forward %llu to mds%d - req dne\n", tid, next_mds);

		goto out;  /* dup reply? */

		goto out;  /* dup reply? */

	}

	}