From dec4c42acf386b54deed991777333949079b59a2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Feb 2010 16:40:07 -0800
Subject: [PATCH] --- yaml --- r: 188735 b: refs/heads/master c:
 080af17e9c6360c5a835528e8de3141a46273ed2 h: refs/heads/master i:   188733:
 f722b4e5276d7e9aad683b111873a7df681b7984   188731:
 b7c1bb01ce26539c12c0c2147059800a191d7498   188727:
 1fbaf0b81f1d52a44ed7941061fa3256fec03cf4   188719:
 2b0c335521bf5aa6351f16f5ce67d253953069d6   188703:
 f730de543eb6f495826a08ead39287faf06cfb52   188671:
 29c5afa9813f13b8c5f4b4c8f6f96ac2b2556705 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/mds_client.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0113dea886d7..9affde3c34bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99eb1c7263a44e63161a041a778b345b5cf0b6a
+refs/heads/master: 080af17e9c6360c5a835528e8de3141a46273ed2
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index bec8a7aeb300..a2600101ec22 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -1899,7 +1899,6 @@ static void handle_forward(struct ceph_mds_client *mdsc,
 	u64 tid = le64_to_cpu(msg->hdr.tid);
 	u32 next_mds;
 	u32 fwd_seq;
-	u8 must_resend;
 	int err = -EINVAL;
 	void *p = msg->front.iov_base;
 	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);
 	next_mds = 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);
 	req = __lookup_request(mdsc, tid);
 	if (!req) {
-		dout("forward %llu dne\n", tid);
+		dout("forward %llu to mds%d - req dne\n", tid, next_mds);
 		goto out;  /* dup reply? */
 	}