[f2fs] code refactoring:
change InodeInfoFlag enum class member name (f2fs_internal.h)
(comment: #429 https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/511841)a
Change-Id: I8f10bab457e5f9eccb930d9e1acb2759b013e340
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/f2fs/+/531072
Reviewed-by: Brett Wilson <brettw@google.com>
diff --git a/data.cc b/data.cc
index c331a55..9051440 100644
--- a/data.cc
+++ b/data.cc
@@ -81,7 +81,7 @@
int VnodeF2fs::ReserveNewBlock(DnodeOfData *dn) {
SbInfo &sbi = fs_->GetSbInfo();
- if (IsInodeFlagSet(&dn->vnode->fi_, InodeInfoFlag::kFiNoAlloc))
+ if (IsInodeFlagSet(&dn->vnode->fi_, InodeInfoFlag::kNoAlloc))
return -EPERM;
if (!IncValidBlockCount(&sbi, dn->vnode, 1))
return -ENOSPC;
diff --git a/dir.cc b/dir.cc
index fc7d006..d6f8403 100644
--- a/dir.cc
+++ b/dir.cc
@@ -261,7 +261,7 @@
// inode *dir = dentry->d_parent->d_inode;
#endif
- if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kFiNewInode)) {
+ if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kNewInode)) {
if (zx_status_t err = Vfs()->Nodemgr().NewInodePage(this, vnode); err != ZX_OK)
return err;
@@ -287,7 +287,7 @@
InitDentInode(vnode, ipage);
F2fsPutPage(ipage, 1);
}
- if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kFiIncLink)) {
+ if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kIncLink)) {
vnode->IncNlink();
vnode->WriteInode(NULL);
}
@@ -297,12 +297,12 @@
void Dir::UpdateParentMetadata(VnodeF2fs *vnode, unsigned int current_depth) {
bool need_dir_update = false;
- if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kFiNewInode)) {
+ if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kNewInode)) {
if (S_ISDIR(vnode->i_mode_)) {
IncNlink();
need_dir_update = true;
}
- ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kFiNewInode);
+ ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kNewInode);
}
auto cur_time = time(nullptr);
@@ -320,8 +320,8 @@
else
MarkInodeDirty(this);
- if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kFiIncLink))
- ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kFiIncLink);
+ if (IsInodeFlagSet(&vnode->fi_, InodeInfoFlag::kIncLink))
+ ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kIncLink);
}
int Dir::RoomForFilename(DentryBlock *dentry_blk, int slots) {
diff --git a/f2fs_internal.h b/f2fs_internal.h
index c7065ef..b225ae3 100644
--- a/f2fs_internal.h
+++ b/f2fs_internal.h
@@ -673,11 +673,11 @@
/* used for InodeInfo->flags */
enum class InodeInfoFlag {
- kFiNewInode = 0, /* indicate newly allocated inode */
- kFiNeedCp, /* need to do checkpoint during fsync */
- kFiIncLink, /* need to increment i_nlink */
- kFiAclMode, /* indicate acl mode */
- kFiNoAlloc, /* should not allocate any blocks */
+ kNewInode = 0, /* indicate newly allocated inode */
+ kNeedCp, /* need to do checkpoint during fsync */
+ kIncLink, /* need to increment i_nlink */
+ kAclMode, /* indicate acl mode */
+ kNoAlloc, /* should not allocate any blocks */
};
static inline void SetInodeFlag(InodeInfo *fi, InodeInfoFlag flag) {
@@ -694,12 +694,12 @@
[[maybe_unused]] static inline void SetAclInode(InodeInfo *fi, umode_t mode) {
fi->i_acl_mode = mode;
- SetInodeFlag(fi, InodeInfoFlag::kFiAclMode);
+ SetInodeFlag(fi, InodeInfoFlag::kAclMode);
}
[[maybe_unused]] static inline int CondClearInodeFlag(InodeInfo *fi, InodeInfoFlag flag) {
- if (IsInodeFlagSet(fi, InodeInfoFlag::kFiAclMode)) {
- ClearInodeFlag(fi, InodeInfoFlag::kFiAclMode);
+ if (IsInodeFlagSet(fi, InodeInfoFlag::kAclMode)) {
+ ClearInodeFlag(fi, InodeInfoFlag::kAclMode);
return 1;
}
return 0;
diff --git a/file.cc b/file.cc
index ea49fa8..7cceb9e 100644
--- a/file.cc
+++ b/file.cc
@@ -149,7 +149,7 @@
if (!S_ISREG(i_mode_) || i_nlink_ != 1)
need_cp = true;
- if (IsInodeFlagSet(&fi_, InodeInfoFlag::kFiNeedCp))
+ if (IsInodeFlagSet(&fi_, InodeInfoFlag::kNeedCp))
need_cp = true;
if (!Vfs()->SpaceForRollForward())
need_cp = true;
@@ -169,7 +169,7 @@
WriteInode(nullptr);
/* all the dirty node pages should be flushed for POR */
ret = Vfs()->SyncFs(1);
- ClearInodeFlag(&fi_, InodeInfoFlag::kFiNeedCp);
+ ClearInodeFlag(&fi_, InodeInfoFlag::kNeedCp);
} else {
Page *node_page = nullptr;
int mark = !Vfs()->Nodemgr().IsCheckpointedNode(Ino());
diff --git a/namei.cc b/namei.cc
index 50b046b..0eb2213 100644
--- a/namei.cc
+++ b/namei.cc
@@ -106,7 +106,7 @@
if (!TestOpt(&sbi, kMountDisableExtIdentify))
SetColdFile(name.data());
- SetInodeFlag(&vnode->fi_, InodeInfoFlag::kFiIncLink);
+ SetInodeFlag(&vnode->fi_, InodeInfoFlag::kIncLink);
if (zx_status_t err = AddLink(name, vnode); err != ZX_OK) {
vnode->ClearNlink();
UnlockNewInode(vnode);
@@ -143,9 +143,9 @@
// AtomicInc(&inode->i_count);
#endif
- SetInodeFlag(&target->fi_, InodeInfoFlag::kFiIncLink);
+ SetInodeFlag(&target->fi_, InodeInfoFlag::kIncLink);
if (zx_status_t err = AddLink(name, target); err != ZX_OK) {
- ClearInodeFlag(&target->fi_, InodeInfoFlag::kFiIncLink);
+ ClearInodeFlag(&target->fi_, InodeInfoFlag::kIncLink);
Iput(target);
return err;
}
@@ -279,9 +279,9 @@
// mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS | __GFP_ZERO);
#endif
- SetInodeFlag(&vnode->fi_, InodeInfoFlag::kFiIncLink);
+ SetInodeFlag(&vnode->fi_, InodeInfoFlag::kIncLink);
if (zx_status_t err = AddLink(name, vnode); err != ZX_OK) {
- ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kFiIncLink);
+ ClearInodeFlag(&vnode->fi_, InodeInfoFlag::kIncLink);
vnode->ClearNlink();
UnlockNewInode(vnode);
Iput(vnode);
@@ -472,7 +472,7 @@
old_vnode->i_ctime_.tv_sec = cur_time;
old_vnode->i_ctime_.tv_nsec = 0;
- SetInodeFlag(&old_vnode->fi_, InodeInfoFlag::kFiNeedCp);
+ SetInodeFlag(&old_vnode->fi_, InodeInfoFlag::kNeedCp);
MarkInodeDirty(old_vnode);
// TODO(djkim): remove this after pager is available
diff --git a/node.cc b/node.cc
index c06ba36..c09b834 100644
--- a/node.cc
+++ b/node.cc
@@ -1195,7 +1195,7 @@
Page *page = nullptr;
int err;
- if (IsInodeFlagSet(&dn->vnode->fi_, InodeInfoFlag::kFiNoAlloc))
+ if (IsInodeFlagSet(&dn->vnode->fi_, InodeInfoFlag::kNoAlloc))
return ZX_ERR_ACCESS_DENIED;
page = GrabCachePage(nullptr, NodeIno(&sbi), dn->nid);
diff --git a/recovery.cc b/recovery.cc
index 890c97c..b65d83a 100644
--- a/recovery.cc
+++ b/recovery.cc
@@ -136,7 +136,7 @@
if (entry) {
entry->blkaddr = blkaddr;
if (IsInode(page) && Nodemgr().IsDentDnode(page)) {
- SetInodeFlag(&entry->vnode->fi_, InodeInfoFlag::kFiIncLink);
+ SetInodeFlag(&entry->vnode->fi_, InodeInfoFlag::kIncLink);
}
} else {
if (IsInode(page) && Nodemgr().IsDentDnode(page)) {
diff --git a/super.cc b/super.cc
index 18ae823..2218d04 100644
--- a/super.cc
+++ b/super.cc
@@ -60,7 +60,7 @@
// fi->i_advise = 0;
// RwlockInit(&fi->ext.ext_lock);
- // SetInodeFlag(fi, InodeInfoFlag::kFiNewInode);
+ // SetInodeFlag(fi, InodeInfoFlag::kNewInode);
// return &fi->vfs_inode;
// }
diff --git a/vnode.cc b/vnode.cc
index 3e77573..d22c196 100644
--- a/vnode.cc
+++ b/vnode.cc
@@ -61,7 +61,7 @@
vnode->fi_.i_advise = 0;
RwlockInit(&vnode->fi_.ext.ext_lock);
- SetInodeFlag(&vnode->fi_, InodeInfoFlag::kFiNewInode);
+ SetInodeFlag(&vnode->fi_, InodeInfoFlag::kNewInode);
}
// TODO(sukka): fill vfs->members in addtion to size
@@ -513,7 +513,7 @@
// if (i_nlink || IsBadInode(this))
// goto no_delete;
-// SetInodeFlag(&fi, InodeInfoFlag::kFiNoAlloc);
+// SetInodeFlag(&fi, InodeInfoFlag::kNoAlloc);
// i_size = 0;
// if (HasBlocks(this))
