From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 21 Sep 2011 18:39:03 +0000 (-0700)
Subject: mds: fix traverse snap vs forward check
X-Git-Tag: v0.36~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca63faf55152349f2f908c949b495eabfb0b630d;p=ceph.git

mds: fix traverse snap vs forward check

This should compare against the forward attempt, not retry attempt.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index a7a93c692dc3..2844882153cb 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -6791,9 +6791,9 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req, Context *fin,     // wh
 
       if (forward &&
 	  snapid && mdr && mdr->client_request &&
-	  (int)depth < mdr->client_request->get_retry_attempt()) {
+	  (int)depth < mdr->client_request->get_num_fwd()) {
 	dout(7) << "traverse: snap " << snapid << " and depth " << depth
-		<< " < retry " << mdr->client_request->get_retry_attempt()
+		<< " < fwd " << mdr->client_request->get_num_fwd()
 		<< ", discovering instead of forwarding" << dendl;
 	discover = true;
       }