commit 87fb5d1b551ddba7202999fdc62ca5043a26a1f9
author Seokhwan Kim <sukka.kim@samsung.com> Fri Jun 04 04:15:02 2021 +0000
committer Brett Wilson <brettw@google.com> Wed Jun 09 02:36:05 2021 +0000
tree 40abc52beaed95f53b2f72307188fb99dc8ce3b7
parent c435d67522d61e90b286aa5fcd14778e768a18e8

[f2fs] Rename GetBlocks() to GetBlockCount()

(comment: #116 https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/536511/4)

Test: fx test fs-tests large-fs-tests

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

dir.cc

diff --git a/dir.cc b/dir.cc
index 239da68..ad3a2ea 100644
--- a/dir.cc
+++ b/dir.cc
@@ -10,7 +10,7 @@
 
 Dir::Dir(F2fs *fs, ino_t ino) : VnodeF2fs(fs, ino) {}
 
-uint64_t Dir::DirBlocks() { return GetBlocks(); }
+uint64_t Dir::DirBlocks() { return GetBlockCount(); }
 
 unsigned int Dir::DirBuckets(unsigned int level) {
   if (level < kMaxDirHashDepth / 2)

vnode.cc

diff --git a/vnode.cc b/vnode.cc
index 47b606b..b2ba304 100644
--- a/vnode.cc
+++ b/vnode.cc
@@ -158,7 +158,7 @@
   a->mode = i_mode_;
   a->inode = ino_;
   a->content_size = i_size_;
-  a->storage_size = GetBlocks() * kBlockSize;
+  a->storage_size = GetBlockCount() * kBlockSize;
   a->link_count = i_nlink_;
   a->creation_time = zx_time_add_duration(ZX_SEC(i_ctime_.tv_sec), i_ctime_.tv_nsec);
   a->modification_time = zx_time_add_duration(ZX_SEC(i_mtime_.tv_sec), i_mtime_.tv_nsec);
@@ -548,7 +548,7 @@
 
 void VnodeF2fs::SetNlink(uint32_t nlink) { i_nlink_ = nlink; }
 
-uint64_t VnodeF2fs::GetBlocks() { return (i_size_ + kBlockSize - 1) / kBlockSize; }
+uint64_t VnodeF2fs::GetBlockCount() { return (i_size_ + kBlockSize - 1) / kBlockSize; }
 
 void MarkInodeDirty(VnodeF2fs *vnode) { vnode->WriteInode(nullptr); }
 

vnode.h

diff --git a/vnode.h b/vnode.h
index f8a4489..d1df008 100644
--- a/vnode.h
+++ b/vnode.h
@@ -117,7 +117,7 @@
   void ClearNlink();
   void SetNlink(uint32_t nlink);
 
-  uint64_t GetBlocks();
+  uint64_t GetBlockCount();
 
   void Notify(std::string_view name, unsigned event) final;
   zx_status_t WatchDir(fs::Vfs *vfs, uint32_t mask, uint32_t options, zx::channel watcher) final;