librbd/cache/pwl/ssd: stronger assert in aio_read_data_blocks()

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ab05cc4a8f4709db649ad51d32141e429d9dc2b3)

diff --git a/src/librbd/cache/pwl/ssd/WriteLog.cc b/src/librbd/cache/pwl/ssd/WriteLog.cc
index 962bfd9fabfdc750bfce14ef3e9c213daacaca99..89ed6c3958b2688ce744fdf6024eb0faa3a298cc 100644 (file)
--- a/src/librbd/cache/pwl/ssd/WriteLog.cc
+++ b/src/librbd/cache/pwl/ssd/WriteLog.cc
@@ -965,8 +965,9 @@ void WriteLog<I>::aio_read_data_blocks(
 
     ldout(cct, 20) << "entry i=" << i << " " << log_entry->write_data_pos
                    << "~" << len << dendl;
-    ceph_assert(log_entry->write_data_pos <= pool_root.pool_size);
-    ceph_assert(align_len != 0);
+    ceph_assert(log_entry->write_data_pos >= DATA_RING_BUFFER_OFFSET &&
+                log_entry->write_data_pos < pool_root.pool_size);
+    ceph_assert(align_len);
     if (log_entry->write_data_pos + align_len > pool_root.pool_size) {
       // spans boundary, need to split
       uint64_t len1 = pool_root.pool_size - log_entry->write_data_pos;