Variadic templates for RPCs

[invirt/third/libt4.git] / lock_client_cache_rsm.cc

diff --git a/lock_client_cache_rsm.cc b/lock_client_cache_rsm.cc
index 80bc87f..c0be985 100644 (file)
--- a/lock_client_cache_rsm.cc
+++ b/lock_client_cache_rsm.cc
@@ -82,7 +82,7 @@ void lock_client_cache_rsm::releaser() {
         {
             sl.unlock();
             int r;
         {
             sl.unlock();
             int r;

-            rsmc->call(lock_protocol::release, lid, id, st.xid, r);
+            rsmc->call(lock_protocol::release, r, lid, id, st.xid);

             sl.lock();
         }
         st.state = lock_state::none;
             sl.lock();
         }
         st.state = lock_state::none;

@@ -117,7 +117,7 @@ lock_protocol::status lock_client_cache_rsm::acquire(lock_protocol::lockid_t lid
             {
                 sl.unlock();
                 int r;
             {
                 sl.unlock();
                 int r;

-                result = rsmc->call(lock_protocol::acquire, lid, id, st.xid, r);
+                result = rsmc->call(lock_protocol::acquire, r, lid, id, st.xid);

                 sl.lock();
             }
             LOG("acquire returned " << result);
                 sl.lock();
             }
             LOG("acquire returned " << result);