update sources to v12.2.5

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

diff --git a/ceph/src/mds/journal.cc b/ceph/src/mds/journal.cc
index 70163f1f15d1d4b51568ec8c696c4cb10db0bb12..decb7d47b7411a4a835878940c60dcf3e7be1fc0 100644 (file)
--- a/ceph/src/mds/journal.cc
+++ b/ceph/src/mds/journal.cc
@@ -506,10 +506,9 @@ void EMetaBlob::fullbit::dump(Formatter *f) const
   inode.dump(f);
   f->close_section(); // inode
   f->open_object_section("xattrs");
-  for (map<string, bufferptr>::const_iterator iter = xattrs.begin();
-      iter != xattrs.end(); ++iter) {
-    string s(iter->second.c_str(), iter->second.length());
-    f->dump_string(iter->first.c_str(), s);
+  for (const auto &p : xattrs) {
+    std::string s(p.second.c_str(), p.second.length());
+    f->dump_string(p.first.c_str(), s);
   }
   f->close_section(); // xattrs
   if (inode.is_symlink()) {
@@ -528,12 +527,10 @@ void EMetaBlob::fullbit::dump(Formatter *f) const
   f->dump_string("state", state_string());
   if (!old_inodes.empty()) {
     f->open_array_section("old inodes");
-    for (old_inodes_t::const_iterator iter = old_inodes.begin();
-        iter != old_inodes.end();
-        ++iter) {
+    for (const auto &p : old_inodes) {
       f->open_object_section("inode");
-      f->dump_int("snapid", iter->first);
-      iter->second.dump(f);
+      f->dump_int("snapid", p.first);
+      p.second.dump(f);
       f->close_section(); // inode
     }
     f->close_section(); // old inodes
@@ -542,9 +539,9 @@ void EMetaBlob::fullbit::dump(Formatter *f) const
 
 void EMetaBlob::fullbit::generate_test_instances(list<EMetaBlob::fullbit*>& ls)
 {
-  inode_t inode;
+  CInode::mempool_inode inode;
   fragtree_t fragtree;
-  map<string,bufferptr> empty_xattrs;
+  CInode::mempool_xattr_map empty_xattrs;
   bufferlist empty_snapbl;
   fullbit *sample = new fullbit("/testdn", 0, 0, 0,
                                 inode, fragtree, empty_xattrs, "", 0, empty_snapbl,
@@ -577,7 +574,7 @@ void EMetaBlob::fullbit::update_inode(MDSRank *mds, CInode *in)
       }
     }
   } else if (in->inode.is_symlink()) {
-    in->symlink = symlink;
+    in->symlink = mempool::mds_co::string(boost::string_view(symlink));
   }
   in->old_inodes = old_inodes;
   if (!in->old_inodes.empty()) {
@@ -989,21 +986,21 @@ void EMetaBlob::get_paths(
 
     for (list<ceph::shared_ptr<fullbit> >::const_iterator
         iter = fb_list.begin(); iter != fb_list.end(); ++iter) {
-      std::string const &dentry = (*iter)->dn;
-      children[dir_ino].push_back(dentry);
-      ino_locations[(*iter)->inode.ino] = Location(dir_ino, dentry);
+      boost::string_view dentry = (*iter)->dn;
+      children[dir_ino].emplace_back(dentry);
+      ino_locations[(*iter)->inode.ino] = Location(dir_ino, std::string(dentry));
     }
 
     for (list<nullbit>::const_iterator
        iter = nb_list.begin(); iter != nb_list.end(); ++iter) {
-      std::string const &dentry = iter->dn;
-      children[dir_ino].push_back(dentry);
+      boost::string_view dentry = iter->dn;
+      children[dir_ino].emplace_back(dentry);
     }
 
     for (list<remotebit>::const_iterator
        iter = rb_list.begin(); iter != rb_list.end(); ++iter) {
-      std::string const &dentry = iter->dn;
-      children[dir_ino].push_back(dentry);
+      boost::string_view dentry = iter->dn;
+      children[dir_ino].emplace_back(dentry);
     }
   }
 
@@ -1020,11 +1017,11 @@ void EMetaBlob::get_paths(
     list<ceph::shared_ptr<fullbit> > const &fb_list = dl.get_dfull();
     for (list<ceph::shared_ptr<fullbit> >::const_iterator
         iter = fb_list.begin(); iter != fb_list.end(); ++iter) {
-      std::string const &dentry = (*iter)->dn;
+      std::string dentry((*iter)->dn);
       children[dir_ino].push_back(dentry);
-      ino_locations[(*iter)->inode.ino] = Location(dir_ino, dentry);
+      ino_locations[(*iter)->inode.ino] = Location(dir_ino, std::string(dentry));
       if (children.find((*iter)->inode.ino) == children.end()) {
-        leaf_locations.push_back(Location(dir_ino, dentry));
+        leaf_locations.push_back(Location(dir_ino, std::string(dentry)));
 
       }
     }
@@ -1032,15 +1029,15 @@ void EMetaBlob::get_paths(
     list<nullbit> const &nb_list = dl.get_dnull();
     for (list<nullbit>::const_iterator
        iter = nb_list.begin(); iter != nb_list.end(); ++iter) {
-      std::string const &dentry = iter->dn;
-      leaf_locations.push_back(Location(dir_ino, dentry));
+      boost::string_view dentry = iter->dn;
+      leaf_locations.push_back(Location(dir_ino, std::string(dentry)));
     }
 
     list<remotebit> const &rb_list = dl.get_dremote();
     for (list<remotebit>::const_iterator
        iter = rb_list.begin(); iter != rb_list.end(); ++iter) {
-      std::string const &dentry = iter->dn;
-      leaf_locations.push_back(Location(dir_ino, dentry));
+      boost::string_view dentry = iter->dn;
+      leaf_locations.push_back(Location(dir_ino, std::string(dentry)));
     }
   }