From: Sage Weil <sage@inktank.com>
Date: Tue, 14 May 2013 17:31:27 +0000 (-0700)
Subject: md/Sever.cc: fix straydn assert
X-Git-Tag: v0.63~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afeb8f2d526ac5b72ff015c6a0d73d62ea58b980;p=ceph.git

md/Sever.cc: fix straydn assert

From fb222a0a1c98a4141b6d0e79eac7a41c208f7147, we only know straydn is
non-null if oldin is non-null.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 4afe10d693fd..b526b5e036ae 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -7103,9 +7103,10 @@ void Server::_rename_rollback_finish(Mutation *mut, MDRequest *mdr, CDentry *src
   if (destdn) {
     CInode *oldin = destdn->get_linkage()->get_inode();
     // update subtree map?
-    assert(straydn);
-    if (oldin && oldin->is_dir())
+    if (oldin && oldin->is_dir()) {
+      assert(straydn);
       mdcache->adjust_subtree_after_rename(oldin, straydn->get_dir(), true);
+    }
   }
 
   if (mds->is_resolve()) {