]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cleanup: use string & to avoid unnecessary copy 12336/head
authorYunchuan Wen <yunchuan.wen@kylin-cloud.com>
Fri, 9 Dec 2016 04:53:22 +0000 (12:53 +0800)
committerYunchuan Wen <yunchuan.wen@kylin-cloud.com>
Sat, 10 Dec 2016 12:26:57 +0000 (20:26 +0800)
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
src/osd/PG.cc

index 6daf383cbc25adcd9d889f65de825434845ffd96..11a068682ae31242ae5746bf5f4f280d693bcd76 100644 (file)
@@ -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,