From 9bf204190b28fb963439b0468f6a8dda4c2be884 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Fri, 13 May 2022 16:47:41 +0900 Subject: [PATCH] seastore/cbjournal: rename init to initialized Signed-off-by: Myoungwon Oh --- .../os/seastore/journal/circular_bounded_journal.cc | 8 ++++---- .../os/seastore/journal/circular_bounded_journal.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc index caedbcb461a25..19bf019a3d5ba 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc @@ -102,7 +102,7 @@ ceph::bufferlist CircularBoundedJournal::encode_header() CircularBoundedJournal::open_for_write_ret CircularBoundedJournal::open_for_write() { - if (init) { + if (initialized) { paddr_t paddr = convert_abs_addr_to_paddr( get_written_to(), header.device_id); @@ -120,7 +120,7 @@ CircularBoundedJournal::close_ertr::future<> CircularBoundedJournal::close() { return write_header( ).safe_then([this]() -> close_ertr::future<> { - init = false; + initialized = false; return device->close(); }).handle_error( open_for_write_ertr::pass_further{}, @@ -134,7 +134,7 @@ CircularBoundedJournal::open_for_write_ret CircularBoundedJournal::open_device_read_header(rbm_abs_addr start) { LOG_PREFIX(CircularBoundedJournal::open_for_write); - ceph_assert(!init); + ceph_assert(!initialized); return _open_device(path ).safe_then([this, start, FNAME]() { return read_header(start @@ -150,7 +150,7 @@ CircularBoundedJournal::open_device_read_header(rbm_abs_addr start) get_written_to(), header.device_id); start_dev_addr = start; - init = true; + initialized = true; return open_for_write_ret( open_for_write_ertr::ready_future_marker{}, journal_seq_t{ diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h index 58f825d62171a..e69c8c6b6b127 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.h +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h @@ -303,7 +303,7 @@ private: * true after open_device_read_header, set to false in close(). * Indicates that device is open and in-memory header is valid. */ - bool init = false; + bool initialized = false; segment_seq_t cur_segment_seq = 0; // segment seq to track the sequence to written records rbm_abs_addr start_dev_addr = 0; // cbjournal start address in device // start address where the newest record will be written -- 2.39.5