include/unordered_{map,set}: remove, use std directly instead

This is only an alias for the `std` classes anyway.  This effectively
reverts commit 8e86720 which added these aliases, probably
because C++11 was new and not all compilers supported it properly, but
that was 12 years ago and we're onl C++20 meanwhile.

Signed-off-by: Max Kellermann <[email protected]>

Author: MaxKellermann

doc/dev/network-encoding.rst

@@ -136,7 +136,7 @@ Lists are represented as an element count followed by that many elements.
 	The size of the elements in the list are not necessarily uniform.
 
 Lists are used to encode ``std::list``, ``std::vector``, ``std::deque``,
-``std::set`` and ``ceph::unordered_set``.
+``std::set`` and ``std::unordered_set``.
 
 Blob
 ----
@@ -179,8 +179,8 @@ Maps are a list of pairs.
 		ceph_pair<K,V> entries[length];
 	}
 
-Maps are used to encode ``std::map``, ``std::multimap`` and
-``ceph::unordered_map``.
+Maps are used to encode ``std::map``, ``std::multimap``,
+``std::unordered_map`` and ``std::unordered_multimap``.
 
 Complex Types
 =============

fusetrace/fusetrace_ll.cc

@@ -30,8 +30,6 @@
 #endif
 #include <time.h>
 
-
-#include "include/unordered_map.h"
 #include "include/hash_namespace.h"
 
 #ifndef __LP64__
@@ -50,6 +48,7 @@ CEPH_HASH_NAMESPACE_END
 #include <fstream>
 #include <map>
 #include <set>
+#include <unordered_map>
 using namespace std;
 
 #include "common/ceph_mutex.h"
@@ -87,7 +86,7 @@ struct Inode {
 };
 
 Inode *root = 0;
-ceph::unordered_map<ino_t, Inode*> inode_map;
+std::unordered_map<ino_t, Inode*> inode_map;
 
 bool make_inode_path(string &buf, Inode *in)
 {

src/client/Client.cc

@@ -524,7 +524,7 @@ void Client::dump_inode(Formatter *f, Inode *in, set<Inode*>& did, bool disconne
   did.insert(in);
   if (in->dir) {
     ldout(cct, 1) << "  dir " << in->dir << " size " << in->dir->dentries.size() << dendl;
-    for (ceph::unordered_map<string, Dentry*>::iterator it = in->dir->dentries.begin();
+    for (auto it = in->dir->dentries.begin();
          it != in->dir->dentries.end();
          ++it) {
       ldout(cct, 1) << "   " << in->ino << " dn " << it->first << " " << it->second << " ref " << it->second->ref << dendl;
@@ -552,9 +552,7 @@ void Client::dump_cache(Formatter *f)
     dump_inode(f, root.get(), did, true);
 
   // make a second pass to catch anything disconnected
-  for (ceph::unordered_map<vinodeno_t, Inode*>::iterator it = inode_map.begin();
-       it != inode_map.end();
-       ++it) {
+  for (auto it = inode_map.begin(); it != inode_map.end(); ++it) {
     if (did.count(it->second))
       continue;
     dump_inode(f, it->second, did, true);
@@ -1876,7 +1874,7 @@ int Client::verify_reply_trace(int r, MetaSession *session,
   bufferlist extra_bl;
   inodeno_t created_ino;
   bool got_created_ino = false;
-  ceph::unordered_map<vinodeno_t, Inode*>::iterator p;
+  std::unordered_map<vinodeno_t, Inode*>::iterator p;
 
   extra_bl = reply->get_extra_bl();
   if (extra_bl.length() >= 8) {
@@ -2858,9 +2856,7 @@ void Client::_handle_full_flag(int64_t pool)
   // field with -ENOSPC as long as we're sure all the ops we cancelled were
   // affecting this pool, and all the objectsets we're purging were also
   // in this pool.
-  for (unordered_map<vinodeno_t,Inode*>::iterator i = inode_map.begin();
-       i != inode_map.end(); ++i)
-  {
+  for (auto i = inode_map.begin(); i != inode_map.end(); ++i) {
     Inode *inode = i->second;
     if (inode->oset.dirty_or_tx
         && (pool == -1 || inode->layout.pool_id == pool)) {
@@ -3178,10 +3174,8 @@ void Client::send_reconnect(MetaSession *session)
   bool allow_multi = session->mds_features.test(CEPHFS_FEATURE_MULTI_RECONNECT);
 
   // i have an open session.
-  ceph::unordered_set<inodeno_t> did_snaprealm;
-  for (ceph::unordered_map<vinodeno_t, Inode*>::iterator p = inode_map.begin();
-       p != inode_map.end();
-       ++p) {
+  std::unordered_set<inodeno_t> did_snaprealm;
+  for (auto p = inode_map.begin(); p != inode_map.end(); ++p) {
     Inode *in = p->second;
     auto it = in->caps.find(mds);
     if (it != in->caps.end()) {
@@ -4726,7 +4720,7 @@ void Client::_invalidate_kernel_dcache()
 
   if (can_invalidate_dentries) {
     if (dentry_invalidate_cb && root->dir) {
-      for (ceph::unordered_map<string, Dentry*>::iterator p = root->dir->dentries.begin();
+      for (auto p = root->dir->dentries.begin();
          p != root->dir->dentries.end();
          ++p) {
        if (p->second->inode)
@@ -10208,7 +10202,7 @@ int Client::_lookup_vino(vinodeno_t vino, const UserPerm& perms, Inode **inode)
 
   int r = make_request(req, perms, NULL, NULL, rand() % mdsmap->get_num_in_mds());
   if (r == 0 && inode != NULL) {
-    unordered_map<vinodeno_t,Inode*>::iterator p = inode_map.find(vino);
+    auto p = inode_map.find(vino);
     ceph_assert(p != inode_map.end());
     *inode = p->second;
     _ll_get(*inode);
@@ -13244,7 +13238,7 @@ int Client::ll_lookup_vino(
   ldout(cct, 3) << __func__ << " " << vino << dendl;
 
   // Check the cache first
-  unordered_map<vinodeno_t,Inode*>::iterator p = inode_map.find(vino);
+  auto p = inode_map.find(vino);
   if (p != inode_map.end()) {
     *inode = p->second;
     _ll_get(*inode);
@@ -13400,10 +13394,8 @@ void Client::_ll_drop_pins()
 {
   ldout(cct, 10) << __func__ << dendl;
   std::set<InodeRef> to_be_put; //this set will be deconstructed item by item when exit
-  ceph::unordered_map<vinodeno_t, Inode*>::iterator next;
-  for (ceph::unordered_map<vinodeno_t, Inode*>::iterator it = inode_map.begin();
-       it != inode_map.end();
-       it = next) {
+  std::unordered_map<vinodeno_t, Inode*>::iterator next;
+  for (auto it = inode_map.begin(); it != inode_map.end(); it = next) {
     Inode *in = it->second;
     next = it;
     ++next;
@@ -13480,7 +13472,7 @@ Inode *Client::ll_get_inode(ino_t ino)
   std::scoped_lock lock(client_lock);
 
   vinodeno_t vino = _map_faked_ino(ino);
-  unordered_map<vinodeno_t,Inode*>::iterator p = inode_map.find(vino);
+  auto p = inode_map.find(vino);
   if (p == inode_map.end())
     return NULL;
   Inode *in = p->second;
@@ -13499,7 +13491,7 @@ Inode *Client::ll_get_inode(vinodeno_t vino)
 
   std::scoped_lock lock(client_lock);
 
-  unordered_map<vinodeno_t,Inode*>::iterator p = inode_map.find(vino);
+  auto p = inode_map.find(vino);
   if (p == inode_map.end())
     return NULL;
   Inode *in = p->second;

src/client/Client.h

@@ -28,8 +28,6 @@
 #include "include/interval_set.h"
 #include "include/lru.h"
 #include "include/types.h"
-#include "include/unordered_map.h"
-#include "include/unordered_set.h"
 #include "include/cephfs/metrics/Types.h"
 #include "mds/mdstypes.h"
 #include "mds/MDSAuthCaps.h"
@@ -50,6 +48,8 @@
 #include <set>
 #include <string>
 #include <thread>
+#include <unordered_map>
+#include <unordered_set>
 
 using std::set;
 using std::map;
@@ -1876,16 +1876,16 @@ class Client : public Dispatcher, public md_config_obs_t {
 
   // file handles, etc.
   interval_set<int> free_fd_set;  // unused fds
-  ceph::unordered_map<int, Fh*> fd_map;
+  std::unordered_map<int, Fh*> fd_map;
   set<Fh*> ll_unclosed_fh_set;
-  ceph::unordered_set<dir_result_t*> opened_dirs;
+  std::unordered_set<dir_result_t*> opened_dirs;
   uint64_t fd_gen = 1;
 
   bool   mount_aborted = false;
   bool   blocklisted = false;
 
-  ceph::unordered_map<vinodeno_t, Inode*> inode_map;
-  ceph::unordered_map<ino_t, vinodeno_t> faked_ino_map;
+  std::unordered_map<vinodeno_t, Inode*> inode_map;
+  std::unordered_map<ino_t, vinodeno_t> faked_ino_map;
   interval_set<ino_t> free_faked_inos;
   ino_t last_used_faked_ino;
   ino_t last_used_faked_root;
@@ -1903,7 +1903,7 @@ class Client : public Dispatcher, public md_config_obs_t {
 
   xlist<Inode*> delayed_list;
   int num_flushing_caps = 0;
-  ceph::unordered_map<inodeno_t,SnapRealm*> snap_realms;
+  std::unordered_map<inodeno_t, SnapRealm*> snap_realms;
   std::map<std::string, std::string> metadata;
 
   ceph::coarse_mono_time last_auto_reconnect;

src/client/Dir.h

@@ -2,6 +2,7 @@
 #define CEPH_CLIENT_DIR_H
 
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 class Dentry;
@@ -10,7 +11,7 @@ struct Inode;
 class Dir {
  public:
   Inode    *parent_inode;  // my inode
-  ceph::unordered_map<std::string, Dentry*> dentries;
+  std::unordered_map<std::string, Dentry*> dentries;
   unsigned num_null_dentries = 0;
 
   std::vector<Dentry*> readdir_cache;

src/client/SyntheticClient.cc

@@ -16,6 +16,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <unordered_map>
 
 
 #include "common/config.h"
@@ -1014,12 +1015,12 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only)
 
   utime_t start = ceph_clock_now();
 
-  ceph::unordered_map<int64_t, int64_t> open_files;
-  ceph::unordered_map<int64_t, dir_result_t*> open_dirs;
+  std::unordered_map<int64_t, int64_t> open_files;
+  std::unordered_map<int64_t, dir_result_t*> open_dirs;
 
-  ceph::unordered_map<int64_t, Fh*> ll_files;
-  ceph::unordered_map<int64_t, dir_result_t*> ll_dirs;
-  ceph::unordered_map<uint64_t, int64_t> ll_inos;
+  std::unordered_map<int64_t, Fh*> ll_files;
+  std::unordered_map<int64_t, dir_result_t*> ll_dirs;
+  std::unordered_map<uint64_t, int64_t> ll_inos;
 
   Inode *i1, *i2;
 
@@ -1514,27 +1515,19 @@ int SyntheticClient::play_trace(Trace& t, string& prefix, bool metadata_only)
   dout(10) << "trace finished on line " << t.get_line() << dendl;
 
   // close open files
-  for (ceph::unordered_map<int64_t, int64_t>::iterator fi = open_files.begin();
-       fi != open_files.end();
-       ++fi) {
+  for (auto fi = open_files.begin(); fi != open_files.end(); ++fi) {
     dout(1) << "leftover close " << fi->second << dendl;
     if (fi->second > 0) client->close(fi->second);
   }
-  for (ceph::unordered_map<int64_t, dir_result_t*>::iterator fi = open_dirs.begin();
-       fi != open_dirs.end();
-       ++fi) {
+  for (auto fi = open_dirs.begin(); fi != open_dirs.end(); ++fi) {
     dout(1) << "leftover closedir " << fi->second << dendl;
     if (fi->second != 0) client->closedir(fi->second);
   }
-  for (ceph::unordered_map<int64_t,Fh*>::iterator fi = ll_files.begin();
-       fi != ll_files.end();
-       ++fi) {
+  for (auto fi = ll_files.begin(); fi != ll_files.end(); ++fi) {
     dout(1) << "leftover ll_release " << fi->second << dendl;
     if (fi->second) client->ll_release(fi->second);
   }
-  for (ceph::unordered_map<int64_t,dir_result_t*>::iterator fi = ll_dirs.begin();
-       fi != ll_dirs.end();
-       ++fi) {
+  for (auto fi = ll_dirs.begin(); fi != ll_dirs.end(); ++fi) {
     dout(1) << "leftover ll_releasedir " << fi->second << dendl;
     if (fi->second) client->ll_releasedir(fi->second);
   }
@@ -1594,8 +1587,8 @@ int SyntheticClient::full_walk(string& basedir)
   frag_info_t empty;
   statq.push_back(empty);
 
-  ceph::unordered_map<inodeno_t, int> nlink;
-  ceph::unordered_map<inodeno_t, int> nlink_seen;
+  std::unordered_map<inodeno_t, int> nlink;
+  std::unordered_map<inodeno_t, int> nlink_seen;
 
   UserPerm perms = client->pick_my_perms();
   while (!dirq.empty()) {
@@ -1674,7 +1667,7 @@ int SyntheticClient::full_walk(string& basedir)
     }
   }
 
-  for (ceph::unordered_map<inodeno_t,int>::iterator p = nlink.begin(); p != nlink.end(); ++p) {
+  for (auto p = nlink.begin(); p != nlink.end(); ++p) {
     if (nlink_seen[p->first] != p->second)
       dout(0) << p->first << " nlink " << p->second << " != " << nlink_seen[p->first] << "seen" << dendl;
   }

src/client/fuse_ll.cc

@@ -46,6 +46,8 @@
 #include "fuse_ll.h"
 #include <fuse_lowlevel.h>
 
+#include <unordered_map>
+
 #define dout_context g_ceph_context
 
 #define FINO_INO(x) ((x) & ((1ull<<48)-1ull))
@@ -77,14 +79,14 @@
  * reserved for CEPH_SNAPDIR.
  */
 struct ceph_fuse_fake_inode_stag {
-  ceph::unordered_map<uint64_t,int> snap_stag_map;  // <snapid, stagid>
-  ceph::unordered_map<int, uint64_t> stag_snap_map; // <stagid, snapid>
+  std::unordered_map<uint64_t, int> snap_stag_map;  // <snapid, stagid>
+  std::unordered_map<int, uint64_t> stag_snap_map; // <stagid, snapid>
   int last_stag = 1;
 };
 
 using namespace std;
 
-static const ceph::unordered_map<int,int> cephfs_errno_to_system_errno = {
+static const std::unordered_map<int, int> cephfs_errno_to_system_errno = {
   {EBLOCKLISTED,    ESHUTDOWN},
   {EPERM,           EPERM},
   {ESTALE,          ESTALE},
@@ -182,7 +184,7 @@ class CephFuse::Handle {
   ceph::mutex stag_lock = ceph::make_mutex("fuse_ll.cc stag_lock");
 
   // a map of <ceph ino, fino stag/snapid map>
-  ceph::unordered_map<uint64_t, struct ceph_fuse_fake_inode_stag> g_fino_maps;
+  std::unordered_map<uint64_t, struct ceph_fuse_fake_inode_stag> g_fino_maps;
 
   pthread_key_t fuse_req_key = 0;
   void set_fuse_req(fuse_req_t);

src/cls/2pc_queue/cls_2pc_queue_types.h

@@ -4,6 +4,8 @@
 
 #include "include/types.h"
 
+#include <unordered_map>
+
 struct cls_2pc_reservation
 {
   using id_t = uint32_t;
@@ -50,7 +52,7 @@ struct cls_2pc_reservation
 };
 WRITE_CLASS_ENCODER(cls_2pc_reservation)
 
-using cls_2pc_reservations = ceph::unordered_map<cls_2pc_reservation::id_t, cls_2pc_reservation>;
+using cls_2pc_reservations = std::unordered_map<cls_2pc_reservation::id_t, cls_2pc_reservation>;
 
 struct cls_2pc_urgent_data
 {

src/common/LogEntry.h

@@ -18,7 +18,6 @@
 #include <fmt/format.h>
 
 #include "include/types.h" // for version_t
-#include "include/unordered_set.h"
 #include "include/utime.h"
 #include "include/utime_fmt.h"
 #include "msg/msg_fmt.h"
@@ -32,6 +31,7 @@
 #include <list>
 #include <map>
 #include <string>
+#include <unordered_set>
 
 namespace ceph {
   class Formatter;
@@ -161,7 +161,7 @@ struct LogSummary {
   // channel -> [(seq#, entry), ...]
   std::map<std::string,std::list<std::pair<uint64_t,LogEntry>>> tail_by_channel;
   uint64_t seq = 0;
-  ceph::unordered_set<LogEntryKey> keys;
+  std::unordered_set<LogEntryKey> keys;
 
   // ---- quincy+ ----
   LRUSet<LogEntryKey> recent_keys;