summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-06-04 11:07:58 -0700
committerSage Weil <sage@inktank.com>2013-06-04 11:07:58 -0700
commit64b3e833f62f2538ffd7bd565d968decf6584691 (patch)
tree3118b5006be0b8729699902ba0df7eb68ac8f5cd
parent05a57bdd1289a63dcf2d4ca2f0dd3d73aff684ac (diff)
downloadceph-64b3e833f62f2538ffd7bd565d968decf6584691.tar.gz
Revert "mds: allow purging "dirty parent" stray inode"
This reverts commit b8f1cb978944a616b69150fdbb3a6b978d75b1dc.
-rw-r--r--src/mds/MDCache.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index d32109a2f32..a75724e1204 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -8584,7 +8584,7 @@ void MDCache::eval_stray(CDentry *dn)
dout(20) << " pending recovery" << dendl;
return; // don't mess with file size probing
}
- if (in->get_num_ref() > (int)in->is_dirty() + (int)in->is_dirty_parent()) {
+ if (in->get_num_ref() > (int)in->is_dirty()) {
dout(20) << " too many inode refs" << dendl;
return;
}
@@ -8865,9 +8865,6 @@ void MDCache::_purge_stray_logged(CDentry *dn, version_t pdv, LogSegment *ls)
// drop inode
if (in->is_dirty())
in->mark_clean();
- if (in->is_dirty_parent())
- in->clear_dirty_parent();
-
remove_inode(in);
// drop dentry?