From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 1 Apr 2011 18:00:44 +0000 (-0700)
Subject: mds: fix discover_path
X-Git-Tag: v0.27~181^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bed4e3a61ccf1c3fb2dcde9449669c5c6f134a4;p=ceph.git

mds: fix discover_path

If we have the base dirfrag, do not request it.  Otherwise we can get a
reply that contains only that (partial progress), and we will then fail
to wake up our dentry waiter.

This was broken with the rewrite in b58b8d098e4c.

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 6166c64b4bc4..8ecf8e1bb9c6 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8101,7 +8101,7 @@ void MDCache::discover_path(CDir *base,
     d.frag = base->get_frag();
     d.snap = snap;
     d.want_path = want_path;
-    d.want_base_dir = true;
+    d.want_base_dir = false;
     d.want_xlocked = want_xlocked;
     _send_discover(d);
   }