os/bluestore: avoid unnecessary memory copy, use variable reference in BlockDevice...

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>

diff --git a/src/os/bluestore/BlockDevice.h b/src/os/bluestore/BlockDevice.h
index 3b0f08c911250ddfe4cda0ec1bd9f1d95b651c95..3f08cd49b5a1a0fe0bbb8365e05079a1f4beab37 100644 (file)
--- a/src/os/bluestore/BlockDevice.h
+++ b/src/os/bluestore/BlockDevice.h
@@ -108,7 +108,7 @@ public:
 
   // for managing buffered readers/writers
   virtual int invalidate_cache(uint64_t off, uint64_t len) = 0;
-  virtual int open(string path) = 0;
+  virtual int open(const string& path) = 0;
   virtual void close() = 0;
 };
 

diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
index 9c2de912c896a9098715ac88b395eca2dbdbe30d..950eada7c258e958ebc4a208256a790e4d1702cd 100644 (file)
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@ -60,7 +60,7 @@ int KernelDevice::_lock()
   return 0;
 }
 
-int KernelDevice::open(string p)
+int KernelDevice::open(const string& p)
 {
   path = p;
   int r = 0;

diff --git a/src/os/bluestore/KernelDevice.h b/src/os/bluestore/KernelDevice.h
index f302923f97365720bdb5a9114b57df64c77de596..8d587481598106e2be61c1d1c2450cce4f4efbaa 100644 (file)
--- a/src/os/bluestore/KernelDevice.h
+++ b/src/os/bluestore/KernelDevice.h
@@ -95,7 +95,7 @@ public:
 
   // for managing buffered readers/writers
   int invalidate_cache(uint64_t off, uint64_t len) override;
-  int open(string path) override;
+  int open(const string& path) override;
   void close() override;
 };
 

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index c0bccd7ddcafe337cab5c6f4ef11effde08a9710..3e0f9443480e8e7d0694439b31e129cc30b13f49 100644 (file)
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -772,7 +772,7 @@ NVMEDevice::NVMEDevice(CephContext* cct, aio_callback_t cb, void *cbpriv)
 }
 
 
-int NVMEDevice::open(string p)
+int NVMEDevice::open(const string& p)
 {
   int r = 0;
   dout(1) << __func__ << " path " << p << dendl;

diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index f6cfd59e96d0c50a31e7ad161c8d932e31d3280e..094de3f41de9a7dd512969bc8b6c6c4d24273f6f 100644 (file)
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -230,7 +230,7 @@ class NVMEDevice : public BlockDevice {
 
   // for managing buffered readers/writers
   int invalidate_cache(uint64_t off, uint64_t len) override;
-  int open(string path) override;
+  int open(const string& path) override;
   void close() override;
 };