From: Kefu Chai <kchai@redhat.com>
Date: Tue, 16 Mar 2021 01:29:41 +0000 (+0800)
Subject: os/bluestore: use transparent comparator
X-Git-Tag: v15.2.14~45^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50971325db3ad9b4e1c8fe23dc7da927d64489a8;p=ceph.git

os/bluestore: use transparent comparator

so we don't need to create an instance of `std::string` just for looking
up in those maps.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 92665cd93ee6d50d1233e7205f9ffece94e63a20)

 Conflicts:
	(trivial) src/os/bluestore/BlueFS.h
---

diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h
index 3fd67c4021f6..6098ec30587e 100644
--- a/src/os/bluestore/BlueFS.h
+++ b/src/os/bluestore/BlueFS.h
@@ -159,7 +159,7 @@ public:
   struct Dir : public RefCountedObject {
     MEMPOOL_CLASS_HELPERS();
 
-    mempool::bluefs::map<string,FileRef> file_map;
+    mempool::bluefs::map<std::string, FileRef, std::less<>> file_map;
 
   private:
     FRIEND_MAKE_REF(Dir);
@@ -293,8 +293,8 @@ private:
   };
 
   // cache
-  mempool::bluefs::map<string, DirRef> dir_map;              ///< dirname -> Dir
-  mempool::bluefs::unordered_map<uint64_t,FileRef> file_map; ///< ino -> File
+  mempool::bluefs::map<std::string, DirRef, std::less<>> dir_map;          ///< dirname -> Dir
+  mempool::bluefs::unordered_map<uint64_t, FileRef> file_map; ///< ino -> File
 
   // map of dirty files, files of same dirty_seq are grouped into list.
   map<uint64_t, dirty_file_list_t> dirty_files;