From 8b178a0765952ca6ae9cea4033b3c4872d5223a7 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Fri, 6 May 2022 15:02:12 +0900 Subject: [PATCH] seastore/cbjournal: rename csum to header_checksum and remove csum_type Signed-off-by: Myoungwon Oh --- src/crimson/os/seastore/journal/circular_bounded_journal.cc | 3 +-- src/crimson/os/seastore/journal/circular_bounded_journal.h | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc index 1d3a852d6b0..d097ed94692 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc @@ -25,8 +25,7 @@ std::ostream &operator<<(std::ostream &out, << ", applied_to="<< header.applied_to << ", written_to=" << header.written_to << ", flsg=" << header.flag - << ", csum_type=" << header.csum_type - << ", csum=" << header.csum + << ", header_checksum=" << header.header_checksum << ", start=" << header.start << ", end=" << header.end << ")"; diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h index c48d5a2f2a8..0cc34915220 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.h +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h @@ -220,8 +220,7 @@ public: rbm_abs_addr applied_to = 0; uint64_t flag = 0; // represent features (reserved) - uint8_t csum_type = 0; // type of checksum algoritghm used in cbj_header_t - uint64_t csum = 0; // checksum of entire cbj_header_t + checksum_t header_checksum = 0; // checksum of entire cbj_header_t rbm_abs_addr start = 0; // start address of CircularBoundedJournal rbm_abs_addr end = 0; // start address of CircularBoundedJournal @@ -240,8 +239,7 @@ public: denc(v.applied_to, p); denc(v.flag, p); - denc(v.csum_type, p); - denc(v.csum, p); + denc(v.header_checksum, p); denc(v.start, p); denc(v.end, p); denc(v.device_id, p); -- 2.39.5