import quincy beta 17.1.0

[ceph.git] / ceph / src / seastar / include / seastar / core / rwlock.hh

diff --git a/ceph/src/seastar/include/seastar/core/rwlock.hh b/ceph/src/seastar/include/seastar/core/rwlock.hh
index 58b046a2f1c5c96b13b4d547b0cf45fe8ff888e0..6d7db304987a44624ff47291e542dfa66da49be9 100644 (file)
--- a/ceph/src/seastar/include/seastar/core/rwlock.hh
+++ b/ceph/src/seastar/include/seastar/core/rwlock.hh
@@ -146,7 +146,7 @@ public:
     /// return an exceptional future) when it failed to obtain the lock -
     /// e.g., on allocation failure.
     future<holder> hold_read_lock(typename semaphore_type::time_point timeout = semaphore_type::time_point::max()) {
-        return get_units(_sem, 1);
+        return get_units(_sem, 1, timeout);
     }
 
     /// hold_write_lock() waits for a write lock and returns an object which,
@@ -161,7 +161,7 @@ public:
     /// return an exceptional future) when it failed to obtain the lock -
     /// e.g., on allocation failure.
     future<holder> hold_write_lock(typename semaphore_type::time_point timeout = semaphore_type::time_point::max()) {
-        return get_units(_sem, max_ops);
+        return get_units(_sem, max_ops, timeout);
     }
 
     /// Checks if any read or write locks are currently held.