import ceph nautilus 14.2.2

[ceph.git] / ceph / src / mds / SnapServer.h

diff --git a/ceph/src/mds/SnapServer.h b/ceph/src/mds/SnapServer.h
index 50925e9553ed7bc565a4f59453b7303eacf9caee..f0a92ce8b558b86bf8e4b06b4646f55fc154efa5 100644 (file)
--- a/ceph/src/mds/SnapServer.h
+++ b/ceph/src/mds/SnapServer.h
@@ -100,11 +100,12 @@ public:
 
   bool upgrade_format() {
     // upgraded from old filesystem
+    ceph_assert(is_active());
     ceph_assert(last_snap > 0);
     bool upgraded = false;
     if (get_version() == 0) {
       // version 0 confuses snapclient code
-      reset_state();
+      reset();
       upgraded = true;
     }
     if (snaprealm_v2_since == CEPH_NOSNAP) {