]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: clean out rename subtree cruft
authorSage Weil <sage@newdream.net>
Tue, 26 Jul 2011 21:59:44 +0000 (14:59 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 27 Jul 2011 03:44:17 +0000 (20:44 -0700)
We used to force these subtrees for rename.  We don't anymore.. this is
old weirdness.

Signed-off-by: Sage Weil <sage@newdream.net>
src/mds/Server.cc

index 81b97aa34bae4b4f0c5b01bba3691f5b924cc630..b8a2afaf42cba2e5a4932f565a6da757b9dbc06d 100644 (file)
@@ -6307,15 +6307,6 @@ void Server::do_rename_rollback(bufferlist &rbl, int master, MDRequest *mdr)
   dout(0) << " destdn back to " << *destdn << dendl;
   if (destdnl->get_inode()) dout(0) << "  desti back to " << *destdnl->get_inode() << dendl;
   
-  // new subtree?
-  if (srcdnl->is_primary() && srcdnl->get_inode()->is_dir()) {
-    list<CDir*> ls;
-    srcdnl->get_inode()->get_nested_dirfrags(ls);
-    int auth = srcdn->authority().first;
-    for (list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) 
-      mdcache->adjust_subtree_auth(*p, auth, auth, false);
-  }
-
   // journal it
   ESlaveUpdate *le = new ESlaveUpdate(mdlog, "slave_rename_rollback", rollback.reqid, master,
                                      ESlaveUpdate::OP_ROLLBACK, ESlaveUpdate::RENAME);