From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 21 Mar 2018 18:28:58 +0000 (-0400)
Subject: mclock: remove (unused) unsafe use of move
X-Git-Tag: v13.1.0~400^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd84c2273649f14073f6777e4c652f559ef14603;p=ceph.git

mclock: remove (unused) unsafe use of move

'next->second' had already been moved into the callback

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/common/mClockPriorityQueue.h b/src/common/mClockPriorityQueue.h
index 2f719f4a7d5..0871b9d7ee0 100644
--- a/src/common/mClockPriorityQueue.h
+++ b/src/common/mClockPriorityQueue.h
@@ -44,8 +44,7 @@ namespace ceph {
     typedef std::list<std::pair<cost_t, T> > ListPairs;
 
     static unsigned filter_list_pairs(ListPairs *l,
-				      std::function<bool (T&&)> f,
-				      std::list<T>* out = nullptr) {
+				      std::function<bool (T&&)> f) {
       unsigned ret = 0;
       for (typename ListPairs::iterator i = l->end();
 	   i != l->begin();
@@ -55,7 +54,6 @@ namespace ceph {
 	--next;
 	if (f(std::move(next->second))) {
 	  ++ret;
-	  if (out) out->push_back(std::move(next->second));
 	  l->erase(next);
 	} else {
 	  i = next;