commit 623b49754d5108c1f2cdbc2fbb0b25afc3f7fb23
author Jaeyoon Choi <j_yoon.choi@samsung.com> Fri May 07 15:45:26 2021 +0900
committer Brett Wilson <brettw@google.com> Tue May 18 18:12:21 2021 +0000
tree 747ad5632a8d303d887c82d28963e1bfcefcfbbf
parent af71e30ad30c3aa228a4b58cb7f7ff349fdd4807

[f2fs] code refactoring:
change VBlock function and variable name to Vblock (f2fs_layout.h, segment.cc)

Change-Id: Ifcc4b43dd12f4278a2d8ecfa7636a2acda77968c
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/531079
Reviewed-by: Brett Wilson <brettw@google.com>

f2fs_layout.h

diff --git a/f2fs_layout.h b/f2fs_layout.h
index af2d7b1..b671ec2 100644
--- a/f2fs_layout.h
+++ b/f2fs_layout.h
@@ -264,8 +264,8 @@
  * [15:10] : allocation type such as CURSEG_XXXX_TYPE
  * [9:0] : valid block count
  */
-constexpr uint32_t kSitVBlocksShift = 10;
-constexpr uint16_t kSitVBlocksMask = (1 << kSitVBlocksShift) - 1;
+constexpr uint32_t kSitVblocksShift = 10;
+constexpr uint16_t kSitVblocksMask = (1 << kSitVblocksShift) - 1;
 
 /*
  * Note that SitEntry->vblocks has the following bit-field information.
@@ -282,9 +282,9 @@
 
 constexpr uint32_t kSitEntryPerBlock = kPageCacheSize / sizeof(SitEntry);
 
-inline uint16_t GetSitVBlocks(SitEntry *raw_sit) { return LeToCpu(raw_sit->vblocks) & kSitVBlocksMask; }
+inline uint16_t GetSitVblocks(SitEntry *raw_sit) { return LeToCpu(raw_sit->vblocks) & kSitVblocksMask; }
 inline uint8_t GetSitType(SitEntry *raw_sit) {
-  return (LeToCpu(raw_sit->vblocks) & ~kSitVBlocksMask) >> kSitVBlocksShift;
+  return (LeToCpu(raw_sit->vblocks) & ~kSitVblocksMask) >> kSitVblocksShift;
 }
 
 struct SitBlock {

segment.cc

diff --git a/segment.cc b/segment.cc
index 46288a3..fea7c55 100644
--- a/segment.cc
+++ b/segment.cc
@@ -33,8 +33,8 @@
 }
 
 inline void SegMgr::SegInfoFromRawSit(SegEntry *se, SitEntry *rs) {
-  se->valid_blocks = GetSitVBlocks(rs);
-  se->ckpt_valid_blocks = GetSitVBlocks(rs);
+  se->valid_blocks = GetSitVblocks(rs);
+  se->ckpt_valid_blocks = GetSitVblocks(rs);
   memcpy(se->cur_valid_map, rs->valid_map, kSitVBlockMapSize);
   memcpy(se->ckpt_valid_map, rs->valid_map, kSitVBlockMapSize);
   se->type = GetSitType(rs);
@@ -42,7 +42,7 @@
 }
 
 inline void SegMgr::SegInfoToRawSit(SegEntry *se, SitEntry *rs) {
-  uint16_t raw_vblocks = (se->type << kSitVBlocksShift) | se->valid_blocks;
+  uint16_t raw_vblocks = (se->type << kSitVblocksShift) | se->valid_blocks;
   rs->vblocks = CpuToLe(raw_vblocks);
   memcpy(rs->valid_map, se->cur_valid_map, kSitVBlockMapSize);
   memcpy(se->ckpt_valid_map, rs->valid_map, kSitVBlockMapSize);
@@ -288,7 +288,7 @@
   uint32_t i;
 
   /* check segment usage */
-  ZX_ASSERT(!(GetSitVBlocks(raw_sit) > sbi.blocks_per_seg));
+  ZX_ASSERT(!(GetSitVblocks(raw_sit) > sbi.blocks_per_seg));
 
   /* check boundary of a given segment number */
   ZX_ASSERT(!(segno > (int)end_segno));
@@ -298,7 +298,7 @@
     if (f2fs_test_bit(i, reinterpret_cast<char *>(raw_sit->valid_map)))
       valid_blocks++;
   }
-  ZX_ASSERT(GetSitVBlocks(raw_sit) == valid_blocks);
+  ZX_ASSERT(GetSitVblocks(raw_sit) == valid_blocks);
 }
 
 inline pgoff_t SegMgr::CurrentSitAddr(uint32_t start) {