From: Igor Fedotov <igor.fedotov@croit.io>
Date: Wed, 9 Nov 2022 01:39:44 +0000 (+0300)
Subject: os/bluestore: increment Bluefs::super.version at _write_super
X-Git-Tag: v17.2.6~172^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e3da60fef97ad7d2682d435f8eda5e7af871572;p=ceph.git

os/bluestore: increment Bluefs::super.version at _write_super

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 0bfc42ac8d3586367e55e71e978d3eb4f62cf5b3)
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 1aec2cb3b2f8..73ad9b1428ce 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -563,7 +563,7 @@ int BlueFS::mkfs(uuid_d osd_uuid, const bluefs_layout_t& layout)
   _init_logger();
   _init_alloc();
 
-  super.version = 1;
+  super.version = 0;
   super.block_size = bdev[BDEV_DB]->get_block_size();
   super.osd_uuid = osd_uuid;
   super.uuid.generate_random();
@@ -1026,6 +1026,7 @@ int BlueFS::fsck()
 
 int BlueFS::_write_super(int dev)
 {
+  ++super.version;
   // build superblock
   bufferlist bl;
   encode(super, bl);
@@ -2487,7 +2488,6 @@ void BlueFS::_rewrite_log_and_layout_sync_LNF_LD(bool allocate_with_fallback,
   }
   dout(10) << __func__ << " writing super, log fnode: " << super.log_fnode << dendl;
 
-  ++super.version;
   _write_super(super_dev);
   _flush_bdev();
 
@@ -2635,7 +2635,6 @@ void BlueFS::_compact_log_async_LD_LNF_D() //also locks FW for new_writer
   new_log->fnode.size = 0;
   new_log->fnode.mtime = ceph_clock_now();
   super.log_fnode = new_log->fnode;
-  ++super.version;
   _write_super(BDEV_DB);
   _flush_bdev();