update ceph source to reef 18.1.2

[ceph.git] / ceph / src / mds / Migrator.cc

diff --git a/ceph/src/mds/Migrator.cc b/ceph/src/mds/Migrator.cc
index 2e76fc2a2b56f846e69d143188567f10406e9ea9..130ed08c1d21ffc665be0c4df1abe86752b284b6 100644 (file)
--- a/ceph/src/mds/Migrator.cc
+++ b/ceph/src/mds/Migrator.cc
@@ -153,21 +153,6 @@ void Migrator::dispatch(const cref_t<Message> &m)
   }
 }
 
-
-class C_MDC_EmptyImport : public MigratorContext {
-  CDir *dir;
-public:
-  C_MDC_EmptyImport(Migrator *m, CDir *d) :
-    MigratorContext(m), dir(d) {
-    dir->get(CDir::PIN_PTRWAITER);
-  }
-  void finish(int r) override {
-    mig->export_empty_import(dir);
-    dir->put(CDir::PIN_PTRWAITER);
-  }
-};
-
-
 void Migrator::export_empty_import(CDir *dir)
 {
   dout(7) << *dir << dendl;
@@ -2850,7 +2835,7 @@ void Migrator::import_reverse(CDir *dir)
       CDentry *dn = p.second;
 
       // dentry
-      dn->state_clear(CDentry::STATE_AUTH);
+      dn->clear_auth();
       dn->clear_replica_map();
       dn->set_replica_nonce(CDentry::EXPORT_NONCE);
       if (dn->is_dirty()) 
@@ -2859,7 +2844,7 @@ void Migrator::import_reverse(CDir *dir)
       // inode?
       if (dn->get_linkage()->is_primary()) {
        CInode *in = dn->get_linkage()->get_inode();
-       in->state_clear(CDentry::STATE_AUTH);
+       in->state_clear(CInode::STATE_AUTH);
        in->clear_replica_map();
        in->set_replica_nonce(CInode::EXPORT_NONCE);
        if (in->is_dirty())