commit 2fc58c5f37af8a7a7bc2038795132ace385982bf
author Dongjin Kim <dongjin_.kim@samsung.com> Tue Apr 27 19:23:28 2021 +0900
committer Brett Wilson <brettw@google.com> Mon May 17 15:40:52 2021 +0000
tree 2f50ea2d4156fe880a690078b3666f3c370a3c93
parent b67637e8ad285443be66ea0161132a4913382d9c

[f2fs] code refactoring:
refine return variable handling in f2fs.cc
(comment: #24, #106, #109 https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/520882)

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

f2fs.cc

diff --git a/f2fs.cc b/f2fs.cc
index 0f7881e..7c474ae 100644
--- a/f2fs.cc
+++ b/f2fs.cc
@@ -73,11 +73,9 @@
   raw_sb_ = std::unique_ptr<f2fs_super_block>(sb);
 
   zx::event event;
-  zx_status_t status = zx::event::create(0, &event);
-  if (status == ZX_OK) {
+  if (zx_status_t status = zx::event::create(0, &event); status == ZX_OK) {
     zx_info_handle_basic_t info;
-    status = event.get_info(ZX_INFO_HANDLE_BASIC, &info, sizeof(info), nullptr, nullptr);
-    if (status == ZX_OK) {
+    if (status = event.get_info(ZX_INFO_HANDLE_BASIC, &info, sizeof(info), nullptr, nullptr); status == ZX_OK) {
       fs_id_ = info.koid;
     }
   }
@@ -88,9 +86,7 @@
 zx_status_t LoadSuperblock(f2fs::Bcache* bc, f2fs_super_block* out_info) {
   char buf[8192];
 
-  zx_status_t status;
-
-  if ((status = bc->Readblk(kSuperblockStart, buf)) != ZX_OK) {
+  if (zx_status_t status = bc->Readblk(kSuperblockStart, buf); status != ZX_OK) {
     FX_LOGS(ERROR) << "could not read info block.";
     return status;
   }
@@ -103,11 +99,9 @@
 zx_status_t F2fs::Create(std::unique_ptr<f2fs::Bcache> bc, const MountOptions& options,
                          std::unique_ptr<F2fs>* out) {
   f2fs_super_block* info;
-  zx_status_t status;
 
   info = new f2fs_super_block();
-  status = LoadSuperblock(bc.get(), info);
-  if (status != ZX_OK) {
+  if (zx_status_t status = LoadSuperblock(bc.get(), info); status != ZX_OK) {
     return status;
   }
 
@@ -153,22 +147,19 @@
   TRACE_DURATION("f2fs", "CreateFsAndRoot");
   f2fs::MountOptions options = mount_options;
 
-  std::unique_ptr<F2fs> fs;
-  zx_status_t status = F2fs::Create(std::move(bcache), options, &fs);
-  if (status != ZX_OK) {
+  std::unique_ptr<F2fs> fs;  
+  if (zx_status_t status = F2fs::Create(std::move(bcache), options, &fs); status != ZX_OK) {
     FX_LOGS(ERROR) << "failed to create filesystem object " << status;
     return status;
   }
-
-  zx_status_t ret = fs->F2fsFillSuper();
-  if (ret != ZX_OK) {
+  
+  if (zx_status_t ret = fs->F2fsFillSuper(); ret != ZX_OK) {
     std::cout << "F2fsFillSuper error " << ret << std::endl;
     return ret;
   }
 
-  fbl::RefPtr<VnodeF2fs> data_root;
-  status = VnodeF2fs::F2fsVget(fs.get(), fs->RawSb().root_ino, &data_root);
-  if (status != ZX_OK) {
+  fbl::RefPtr<VnodeF2fs> data_root;  
+  if (zx_status_t status = VnodeF2fs::F2fsVget(fs.get(), fs->RawSb().root_ino, &data_root); status != ZX_OK) {
     FX_LOGS(ERROR) << "cannot find root inode: " << status;
     return status;
   }
@@ -269,55 +260,52 @@
 
 zx_status_t FlushDirtyNodePage(F2fs* fs, Page* page) {
   f2fs_sb_info& sbi = fs->SbInfo();
-  zx_status_t ret = ZX_OK;
 
   if (!page)
-    return ret;
+    return ZX_OK;
 
   ZX_ASSERT(page->host == nullptr);
   ZX_ASSERT(page->host_nid == F2FS_NODE_INO(&sbi));
 
-  ret = fs->Nodemgr().F2fsWriteNodePage(page, nullptr);
-  if (ret) {
+  if (zx_status_t ret = fs->Nodemgr().F2fsWriteNodePage(page, nullptr); ret != ZX_OK) {
     std::cout << "Node page write error " << ret << std::endl;
+    return ret;
   }
 
-  return ret;
+  return ZX_OK;
 }
 
 zx_status_t FlushDirtyMetaPage(F2fs* fs, Page* page) {
   f2fs_sb_info& sbi = fs->SbInfo();
-  zx_status_t ret = ZX_OK;
 
   if (!page)
-    return ret;
+    return ZX_OK;
 
   ZX_ASSERT(page->host == nullptr);
   ZX_ASSERT(page->host_nid == F2FS_META_INO(&sbi));
 
-  ret = fs->F2fsWriteMetaPage(page, nullptr);
-  if (ret) {
+  if (zx_status_t ret = fs->F2fsWriteMetaPage(page, nullptr); ret != ZX_OK) {
     std::cout << "Meta page write error " << ret << std::endl;
+    return ret;
   }
 
-  return ret;
+  return ZX_OK;
 }
 
 zx_status_t FlushDirtyDataPage(F2fs* fs, Page* page) {
-  zx_status_t ret = ZX_OK;
-
   if (!page)
-    return ret;
+    return ZX_OK;
 
   ZX_ASSERT(page->host != nullptr);
 
   VnodeF2fs* vnode = static_cast<VnodeF2fs*>(page->host);
-  ret = vnode->F2fsWriteDataPage(page, nullptr);
-  if (ret) {
+  
+  if (zx_status_t ret = vnode->F2fsWriteDataPage(page, nullptr); ret != ZX_OK) {
     std::cout << "Data page write error " << ret << std::endl;
+    return ret;
   }
 
-  return ret;
+  return ZX_OK;
 }
 
 }  // namespace f2fs