From: Samuel Just <sjust@redhat.com>
Date: Thu, 20 Aug 2020 21:25:52 +0000 (-0700)
Subject: crimson/os/seastore/seastore_types: permit paddr_t::operator- to operate on block... 
X-Git-Tag: v16.1.0~983^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1a4471192bcf7e4944e2f4086a11c176e659f7b;p=ceph.git

crimson/os/seastore/seastore_types: permit paddr_t::operator- to operate on block relative addrs

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index b1035612aeb7..2bb5a4939e1c 100644
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -115,7 +115,8 @@ struct paddr_t {
    * block_relative address.
    */
   paddr_t operator-(paddr_t rhs) const {
-    assert(rhs.is_record_relative() && is_record_relative());
+    assert(rhs.is_relative() && is_relative());
+    assert(rhs.segment == segment);
     return paddr_t{
       BLOCK_REL_SEG_ID,
       offset - rhs.offset