]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1741 from ceph/wip-early-reply
authorYan, Zheng <ukernel@gmail.com>
Wed, 30 Apr 2014 17:36:49 +0000 (01:36 +0800)
committerYan, Zheng <ukernel@gmail.com>
Wed, 30 Apr 2014 17:36:49 +0000 (01:36 +0800)
Wip early reply

1  2 
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Mutation.h
src/mds/Server.cc

Simple merge
Simple merge
Simple merge
index 672d6ee57d6a37e7a5bbac009777ba46eb094033,6e30744ccee475659e40ce46279dfcba95007572..c8a3ebc50cfea041fb463481824353f807a19f31
@@@ -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);