From: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
Date: Fri, 9 Dec 2016 04:53:22 +0000 (+0800)
Subject: cleanup: use string & to avoid unnecessary copy
X-Git-Tag: v12.0.0~350^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0dfb98fd6d068d56e41ba70da6889e5e04bf559;p=ceph.git

cleanup: use string & to avoid unnecessary copy

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 6daf383cbc2..11a068682ae 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1868,9 +1868,9 @@ bool PG::op_has_sufficient_caps(OpRequestRef& op)
   OSDCap& caps = session->caps;
   session->put();
 
-  string key = req->get_object_locator().key;
-  if (key.length() == 0)
-    key = req->get_oid().name;
+  const string &key = req->get_object_locator().key.empty() ?
+                      req->get_oid().name :
+                      req->get_object_locator().key;
 
   bool cap = caps.is_capable(pool.name, req->get_object_locator().nspace,
                              pool.auid, key,