]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert change from commit 8c5fea68cb9e0c2e6cc2352e64c4f3f46e29c58f 20270/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Fri, 2 Feb 2018 19:56:36 +0000 (14:56 -0500)
committerJ. Eric Ivancich <ivancich@redhat.com>
Fri, 2 Feb 2018 19:56:36 +0000 (14:56 -0500)
that introduced a compilation error that was not noticed since the
dmclock support/testing simulators are not built by ceph.

Also, changes below the src/dmclock tree should be made in the dmclock
library and then pulled into ceph.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
src/dmclock/sim/src/ssched/ssched_server.h

index 5493ca2a7d13c701a36c43e74950bb1c18c13a4b..fcc7055450a4b7ab2918dae7a1020a4eb66f2042 100644 (file)
@@ -104,10 +104,11 @@ namespace crimson {
       void add_request(R&& request,
                       const C& client_id,
                       const ReqParams& req_params) {
-       add_request(std::move(request), client_id, req_params);
+       add_request(RequestRef(new R(std::move(request))),
+                   client_id, req_params);
       }
 
-      void add_request(R&& request,
+      void add_request(RequestRef&& request,
                       const C& client_id,
                       const ReqParams& req_params) {
        DataGuard g(queue_mtx);