From: Samuel Just <sjust@redhat.com>
Date: Fri, 28 Aug 2020 08:53:41 +0000 (-0700)
Subject: crimson/os/seastore/journal: use metadata size for block base rather than assuming... 
X-Git-Tag: v16.1.0~807^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bc64de8eabfd3b23cb9646d04d5f66bc241eb98;p=ceph.git

crimson/os/seastore/journal: use metadata size for block base rather than assuming one block

Uncaught because it's rare for the metadata prefix to exceed 4k.

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

diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h
index ce42bbba0357..83234fc8c446 100644
--- a/src/crimson/os/seastore/journal.h
+++ b/src/crimson/os/seastore/journal.h
@@ -150,9 +150,9 @@ public:
     return roll.safe_then(
       [this, rsize, record=std::move(record)]() mutable {
 	return write_record(rsize, std::move(record)
-	).safe_then([this](auto addr) {
+	).safe_then([this, rsize](auto addr) {
 	  return std::make_pair(
-	    addr.add_offset(block_size),
+	    addr.add_offset(rsize.mdlength),
 	    get_journal_seq(addr));
 	});
       });