diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-14 10:31:27 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-14 10:31:27 -0700 |
| commit | afeb8f2d526ac5b72ff015c6a0d73d62ea58b980 (patch) | |
| tree | 3b890289c123ac619e81ab9b8ddaa797807bd03f | |
| parent | 29d8ec4ecd984a4a394383830e775a05be24b0de (diff) | |
| download | ceph-afeb8f2d526ac5b72ff015c6a0d73d62ea58b980.tar.gz | |
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>
| -rw-r--r-- | src/mds/Server.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 4afe10d693f..b526b5e036a 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()) { |