buffer: Fix bufferlist::zero bug with special case

Fixes: #12252
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 43f583d160ccaf879eaf0f3020e77860cf8d1df0)

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 88656e836bd29fc8d51f94e6a30024e8bbf0e3d4..2a91ec34bf84d3958555a986a2f12cc6d2344c79 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -1165,12 +1165,23 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
         it != _buffers.end();
         ++it) {
       if (p + it->length() > o) {
-       if (p >= o && p+it->length() <= o+l)
-         it->zero();                         // all
-       else if (p >= o) 
-         it->zero(0, o+l-p);                 // head
-       else
-         it->zero(o-p, it->length()-(o-p));  // tail
+        if (p >= o && p+it->length() <= o+l) {
+          // 'o'------------- l -----------|
+          //      'p'-- it->length() --|
+         it->zero();
+        } else if (p >= o) {
+          // 'o'------------- l -----------|
+          //    'p'------- it->length() -------|
+         it->zero(0, o+l-p);
+        } else if (p + it->length() <= o+l) {
+          //     'o'------------- l -----------|
+          // 'p'------- it->length() -------|
+         it->zero(o-p, it->length()-(o-p));
+        } else {
+          //       'o'----------- l -----------|
+          // 'p'---------- it->length() ----------|
+          it->zero(o-p, l);
+        }
       }
       p += it->length();
       if (o+l <= p)