mds: don't complete freeze while parent inode is frozen

This makes maybe_finish_freeze() conditions match that of is_freezeable()
and avoids an assert.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 5262841b01e826d6ffef5b4a00c1f346568da542..867174c4f4141dccd8dd5d100100d35bd11629b8 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -563,6 +563,8 @@ public:
     }
     if (nested_auth_pins != 0) 
       return;
+    if (!is_subtree_root() && inode->is_frozen())
+      return;
     if (state_test(STATE_FREEZINGTREE)) {
       _freeze_tree();
       auth_unpin(this);