]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
seastore/cbjournal: rename init to initialized
authormyoungwon oh <ohmyoungwon@gmail.com>
Fri, 13 May 2022 07:47:41 +0000 (16:47 +0900)
committermyoungwon oh <ohmyoungwon@gmail.com>
Thu, 19 May 2022 00:52:20 +0000 (09:52 +0900)
Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
src/crimson/os/seastore/journal/circular_bounded_journal.cc
src/crimson/os/seastore/journal/circular_bounded_journal.h

index caedbcb461a257ea880d281e3e4c66d4520a1fa2..19bf019a3d5ba4ae9ec9845dd359504c96b8ec5f 100644 (file)
@@ -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{
index 58f825d62171ab1352499cd87b3130555ce57be7..e69c8c6b6b127d77b9c2b7781daf457228311694 100644 (file)
@@ -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