]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: replay: save the right dir!
authorGreg Farnum <gregory.farnum@dreamhost.com>
Wed, 8 Jun 2011 23:52:57 +0000 (16:52 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 9 Jun 2011 22:33:21 +0000 (15:33 -0700)
We were using the wrong one and breaking replay.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
src/mds/journal.cc

index b131ddeeb99a8e2d42b56ba18e44571400e445fb..b1cfad5fd9ea3a8dc328e5266d22e6eae112e31d 100644 (file)
@@ -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)