From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 14 Jan 2019 23:40:30 +0000 (-0800)
Subject: Merge PR #25879 into master
X-Git-Tag: v14.1.0~389
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0eb0e350bced009bd13bdcb13bbc35fd4d15f8e;p=ceph.git

Merge PR #25879 into master

* refs/pull/25879/head:
	client: define template to declare ref
	client: use message smart ptr instead of raw ptr
	client: make map lookup optimizations
	client: do not clear message payload
	client: clean up variable name
	*: use std::string_view instead of char ptr

Reviewed-by: Sage Weil <sage@redhat.com>
---

f0eb0e350bced009bd13bdcb13bbc35fd4d15f8e
diff --cc src/messages/MLock.h
index be126582268,eec664d800b..decaabae7be
--- a/src/messages/MLock.h
+++ b/src/messages/MLock.h
@@@ -65,10 -65,10 +65,10 @@@ protected
    ~MLock() override {}
    
  public:
-   const char *get_type_name() const override { return "ILock"; }
+   std::string_view get_type_name() const override { return "ILock"; }
    void print(ostream& out) const override {
 -    out << "lock(a=" << get_lock_action_name(action)
 -	<< " " << get_lock_type_name(lock_type)
 +    out << "lock(a=" << SimpleLock::get_lock_action_name(action)
 +	<< " " << SimpleLock::get_lock_type_name(lock_type)
  	<< " " << object_info
  	<< ")";
    }