Merge branch 'next'

diff --cc src/mds/Server.cc
index 11e7c53909aa70f042bca48df4b2f396af1da73f,e35dc730143ce8078a0a45fbc389285c94e93dc6..f40e143b813d484bfb97b1fce44c674fa5354837
--- 1/src/mds/Server.cc
--- 2/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@@ -1871,11 -1875,10 +1875,11 @@@ CInode* Server::rdlock_path_pin_ref(MDR
  
    // traverse
    int r = mdcache->path_traverse(mdr, NULL, NULL, refpath, &mdr->dn[n], &mdr->in[n], MDS_TRAVERSE_FORWARD);
 -  if (r > 0) return false; // delayed
 +  if (r > 0)
 +    return NULL; // delayed
    if (r < 0) {  // error
      if (r == -ENOENT && n == 0 && mdr->dn[n].size()) {
-       reply_request(mdr, r, NULL, mdr->dn[n][mdr->dn[n].size()-1]);
+       reply_request(mdr, r, NULL, no_lookup ? NULL : mdr->dn[n][mdr->dn[n].size()-1]);
      } else if (r == -ESTALE) {
        dout(10) << "FAIL on ESTALE but attempting recovery" << dendl;
        Context *c = new C_MDS_TryFindInode(this, mdr);