update ceph source to reef 18.1.2

[ceph.git] / ceph / src / librbd / io / SimpleSchedulerObjectDispatch.cc

diff --git a/ceph/src/librbd/io/SimpleSchedulerObjectDispatch.cc b/ceph/src/librbd/io/SimpleSchedulerObjectDispatch.cc
index 6b50c46ad528214ee20f4eb9c548b2437ad608b2..cd2ffb1975d183ad2f60aeb586d7209058227c59 100644 (file)
--- a/ceph/src/librbd/io/SimpleSchedulerObjectDispatch.cc
+++ b/ceph/src/librbd/io/SimpleSchedulerObjectDispatch.cc
@@ -105,7 +105,8 @@ bool SimpleSchedulerObjectDispatch<I>::ObjectRequests::try_delay_request(
 
     // try to merge back to an existing request
     iter = m_delayed_requests.lower_bound(object_off);
-    if (iter == m_delayed_requests.end() || iter->first > object_off) {
+    if (iter != m_delayed_requests.begin() &&
+        (iter == m_delayed_requests.end() || iter->first > object_off)) {
       iter--;
     }
     if (iter != m_delayed_requests.end() &&