f2fs: clean up f2fs_abort_atomic_write()
Chao Yu
maintainerPATCH 1/1 f2fs: clean up f2fs_abort_atomic_write()
From: Chao Yu <[email protected]>
f2fs_abort_atomic_write() has checked whether current inode is atomic_write one or not, it's redundant to check in its caller, remove it for cleanup.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/file.c | 9 +++------ fs/f2fs/inode.c | 3 +-- fs/f2fs/segment.c | 27 ++++++++++++++------------- fs/f2fs/super.c | 3 +-- 4 files changed, 19 insertions(+), 23 deletions(-)
fs/f2fs/file.c +3 -6
@@ -1822,8 +1822,7 @@ static int f2fs_release_file(struct inode *inode, struct file *filp) atomic_read(&inode->i_writecount) != 1)return 0 ; -if (f2fs_is_atomic_file (inode)) -f2fs_abort_atomic_write (inode, true); +f2fs_abort_atomic_write (inode, true);return 0 ; }
@@ -1837,8 +1836,7 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)* until all the writers close its file. Since this should be done * before dropping file lock, it needs to do in ->flush. */ -if (f2fs_is_atomic_file (inode) && -F2FS_I (inode)->atomic_write_task == current) +if (F2FS_I (inode)->atomic_write_task == current)f2fs_abort_atomic_write (inode, true);return 0 ; }
@@ -2124,8 +2122,7 @@ static int f2fs_ioc_abort_atomic_write(struct file *filp)inode_lock (inode); -if (f2fs_is_atomic_file (inode)) -f2fs_abort_atomic_write (inode, true); +f2fs_abort_atomic_write (inode, true);inode_unlock (inode);
fs/f2fs/inode.c +1 -2
@@ -744,8 +744,7 @@ void f2fs_evict_inode(struct inode *inode)nid_t xnid =F2FS_I (inode)->i_xattr_nid;int err =0 ; -if (f2fs_is_atomic_file (inode)) -f2fs_abort_atomic_write (inode, true); +f2fs_abort_atomic_write (inode, true);trace_f2fs_evict_inode (inode);truncate_inode_pages_final (&inode->i_data);
fs/f2fs/segment.c +14 -13
@@ -190,19 +190,20 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode_info *fi =F2FS_I (inode); -if (f2fs_is_atomic_file (inode)) { -if (clean) -truncate_inode_pages_final (inode->i_mapping); -clear_inode_flag (fi->cow_inode,FI_COW_FILE ); -iput (fi->cow_inode); - fi->cow_inode =NULL ; -release_atomic_write_cnt (inode); -clear_inode_flag (inode,FI_ATOMIC_FILE ); - -spin_lock (&sbi->inode_lock[ATOMIC_FILE ]); - sbi->atomic_files--; -spin_unlock (&sbi->inode_lock[ATOMIC_FILE ]); - } +if (!f2fs_is_atomic_file (inode)) +return ; + +if (clean) +truncate_inode_pages_final (inode->i_mapping); +clear_inode_flag (fi->cow_inode,FI_COW_FILE ); +iput (fi->cow_inode); + fi->cow_inode =NULL ; +release_atomic_write_cnt (inode); +clear_inode_flag (inode,FI_ATOMIC_FILE ); + +spin_lock (&sbi->inode_lock[ATOMIC_FILE ]); + sbi->atomic_files--; +spin_unlock (&sbi->inode_lock[ATOMIC_FILE ]); } static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,
fs/f2fs/super.c +1 -2
@@ -1411,8 +1411,7 @@ static int f2fs_drop_inode(struct inode *inode)atomic_inc (&inode->i_count);spin_unlock (&inode->i_lock); -if (f2fs_is_atomic_file (inode)) -f2fs_abort_atomic_write (inode, true); +f2fs_abort_atomic_write (inode, true);/* should remain fi->extent_tree for writepage */ f2fs_destroy_extent_node (inode);
Signature · 1 line
2.36.1