From 84b279a4b3e6b33ce065e4907a7a1bc0862bb4a2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 4 Jun 2010 11:07:09 -0700
Subject: [PATCH] mds: fix straydn->first part deux

9ed0c30ecf6611193db52e1facc1f46b37f04bc4 forgot to remove the old code.
---
 src/mds/Server.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 9ac78ea3788..d8ce9bd7283 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -3856,7 +3856,6 @@ void Server::_unlink_local(MDRequest *mdr, CDentry *dn, CDentry *straydn)
     } else
       in->snaprealm->project_past_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
 
-    straydn->first = in->first;
     le->metablob.add_primary_dentry(straydn, true, in, 0, &snapbl);
   } else {
     // remote link.  update remote inode.
@@ -4582,7 +4581,7 @@ void Server::_rename_prepare(MDRequest *mdr,
 	destdnl->get_inode()->close_snaprealm(true);  // or a matching join
       } else
 	destdnl->get_inode()->snaprealm->project_past_parent(straydn->get_dir()->inode->find_snaprealm(), snapbl);
-      straydn->first = destdnl->get_inode()->first;
+      straydn->first = destdnl->get_inode()->first;  // XXX hmm, is this right?
       tji = metablob->add_primary_dentry(straydn, true, destdnl->get_inode(), 0, &snapbl);
     } else if (destdnl->is_remote()) {
       metablob->add_dir_context(destdnl->get_inode()->get_parent_dir());