From: Yan, Zheng <ukernel@gmail.com>
Date: Wed, 30 Apr 2014 17:36:49 +0000 (+0800)
Subject: Merge pull request #1741 from ceph/wip-early-reply
X-Git-Tag: v0.81~99
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8979eb394508452ed42db17c281c6d45bb6917a5;p=ceph.git

Merge pull request #1741 from ceph/wip-early-reply

Wip early reply
---

8979eb394508452ed42db17c281c6d45bb6917a5
diff --cc src/mds/Server.cc
index 672d6ee57d6a,6e30744ccee4..c8a3ebc50cfe
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@@ -4423,13 -4453,16 +4426,12 @@@ void Server::_link_remote_finish(MDRequ
  
    mdr->apply();
  
+   MDRequestRef null_ref;
    if (inc)
-     mds->mdcache->send_dentry_link(dn);
-   else {
-     MDRequestRef null_ref;
+     mds->mdcache->send_dentry_link(dn, null_ref);
+   else
      mds->mdcache->send_dentry_unlink(dn, NULL, null_ref);
-   }
    
 -  // commit anchor update?
 -  if (mdr->more()->dst_reanchor_atid) 
 -    mds->anchorclient->commit(mdr->more()->dst_reanchor_atid, mdr->ls);
 -
    // bump target popularity
    mds->balancer->hit_inode(mdr->now, targeti, META_POP_IWR);
    mds->balancer->hit_dir(mdr->now, dn->get_dir(), META_POP_IWR);