commit 93939a4f88d7abf6becf746942d2fe4699b3b0bf
author Jaeyoon Choi <j_yoon.choi@samsung.com> Fri May 07 14:33:14 2021 +0900
committer Brett Wilson <brettw@google.com> Tue May 18 18:05:01 2021 +0000
tree 1d641d7c68fc9e1fb44aad9199b9e2f20f2a8031
parent f88b4027f33979a93b960f8b3f9a248746244396

[f2fs] code refactoring:
change constexpr KAddressInode to kAddressInode (f2fs_layout.h)

  (comment: #9, #128 https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/511840)

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

data.cc

diff --git a/data.cc b/data.cc
index bf79cca..c331a55 100644
--- a/data.cc
+++ b/data.cc
@@ -48,7 +48,7 @@
   }
 
   if (start_bidx)
-    start_bidx = bidx * kAddrsPerBlock + KAddrsPerInode;
+    start_bidx = bidx * kAddrsPerBlock + kAddrsPerInode;
   return start_bidx;
 }
 
@@ -447,7 +447,7 @@
 //     unsigned int end_offset;
 
 //     end_offset = IsInode(dn.node_page) ?
-//         KAddrsPerInode :
+//         kAddrsPerInode :
 //         kAddrsPerBlock;
 
 //     clear_buffer_new(bh_result);

f2fs_internal.h

diff --git a/f2fs_internal.h b/f2fs_internal.h
index 0f8987d..74ccad1 100644
--- a/f2fs_internal.h
+++ b/f2fs_internal.h
@@ -238,11 +238,11 @@
 /*
  * For directory operation
  */
-constexpr size_t kNodeDir1Block = KAddrsPerInode + 1;
-constexpr size_t kNodeDir2Block = KAddrsPerInode + 2;
-constexpr size_t kNodeInd1Block = KAddrsPerInode + 3;
-constexpr size_t kNodeInd2Block = KAddrsPerInode + 4;
-constexpr size_t kNodeDIndBlock = KAddrsPerInode + 5;
+constexpr size_t kNodeDir1Block = kAddrsPerInode + 1;
+constexpr size_t kNodeDir2Block = kAddrsPerInode + 2;
+constexpr size_t kNodeInd1Block = kAddrsPerInode + 3;
+constexpr size_t kNodeInd2Block = kAddrsPerInode + 4;
+constexpr size_t kNodeDIndBlock = kAddrsPerInode + 5;
 
 /*
  * For superblock

f2fs_layout.h

diff --git a/f2fs_layout.h b/f2fs_layout.h
index c48db0b..95a0854 100644
--- a/f2fs_layout.h
+++ b/f2fs_layout.h
@@ -172,7 +172,7 @@
 } __attribute__((packed));
 
 constexpr uint32_t kMaxNameLen = 256;
-constexpr int KAddrsPerInode = 923;  /* Address Pointers in an Inode */
+constexpr int kAddrsPerInode = 923;  /* Address Pointers in an Inode */
 constexpr int kAddrsPerBlock = 1018; /* Address Pointers in a Direct Block */
 constexpr int kNidsPerBlock = 1018;  /* Node IDs in an Indirect Block */
 
@@ -201,7 +201,7 @@
 
   Extent i_ext; /* caching a largest extent */
 
-  uint32_t i_addr[KAddrsPerInode]; /* Pointers to data blocks */
+  uint32_t i_addr[kAddrsPerInode]; /* Pointers to data blocks */
 
   uint32_t i_nid[5]; /* direct(2), indirect(2),
                            double_indirect(1) node id */

node.cc

diff --git a/node.cc b/node.cc
index d637168..c06ba36 100644
--- a/node.cc
+++ b/node.cc
@@ -680,7 +680,7 @@
  * Offset[0] will have raw inode offset.
  */
 int NodeMgr::GetNodePath(long block, int offset[4], uint32_t noffset[4]) {
-  const long direct_index = KAddrsPerInode;
+  const long direct_index = kAddrsPerInode;
   const long direct_blks = kAddrsPerBlock;
   const long dptrs_per_blk = kNidsPerBlock;
   const long indirect_blks = kAddrsPerBlock * kNidsPerBlock;

recovery.cc

diff --git a/recovery.cc b/recovery.cc
index 93bdcae..890c97c 100644
--- a/recovery.cc
+++ b/recovery.cc
@@ -268,7 +268,7 @@
 
   start = StartBidxOfNode(Nodemgr().OfsOfNode(page));
   if (IsInode(page)) {
-    end = start + KAddrsPerInode;
+    end = start + kAddrsPerInode;
   } else {
     end = start + kAddrsPerBlock;
   }

super.cc

diff --git a/super.cc b/super.cc
index 52ecd2a..f0fc7b6 100644
--- a/super.cc
+++ b/super.cc
@@ -258,7 +258,7 @@
 // }
 
 // loff_t F2fs::MaxFileSize(unsigned bits) {
-//   loff_t result = KAddrsPerInode;
+//   loff_t result = kAddrsPerInode;
 //   loff_t leaf_count = kAddrsPerBlock;
 
 //   /* two direct node blocks */

vnode.cc

diff --git a/vnode.cc b/vnode.cc
index 1e2cf33..3e77573 100644
--- a/vnode.cc
+++ b/vnode.cc
@@ -450,7 +450,7 @@
 //   }
 
 //   if (IsInode(dn.node_page))
-//     count = KAddrsPerInode;
+//     count = kAddrsPerInode;
 //   else
 //     count = kAddrsPerBlock;