From c1ea3a263b8791a9ebcf6015cbe5db17287cb5dc Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Wed, 8 Jun 2011 16:52:57 -0700
Subject: [PATCH] mds: replay: save the right dir!

We were using the wrong one and breaking replay.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---
 src/mds/journal.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index b131ddeeb99..b1cfad5fd9e 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -579,7 +579,7 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg)
 	if (dn->get_linkage()->get_inode() != in && in->get_parent_dn()) {
 	  dout(10) << "EMetaBlob.replay unlinking " << *in << dendl;
 	  if (in == renamed_diri)
-	    olddir = dir;
+	    olddir = in->get_parent_dn()->get_dir();
 	  in->get_parent_dn()->get_dir()->unlink_inode(in->get_parent_dn());
 	}
 	if (in->get_parent_dn() && in->inode.anchored != p->inode.anchored)