TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f2fs: clean up f2fs_abort_atomic_write()

Browse Source 
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 <chao.yu@oppo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu
2022-08-04 21:38:21 +08:00
committed by Jaegeuk Kim
parent acc8d7d0c9
commit 8d84ee1f67
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/f2fs/file.c
View File

@@ -1839,7 +1839,6 @@ static int f2fs_release_file(struct inode *inode, struct file *filp)
atomic_read(&inode->i_writecount) != 1) atomic_read(&inode->i_writecount) != 1)
return 0; return 0;
if (f2fs_is_atomic_file(inode))
f2fs_abort_atomic_write(inode, true); f2fs_abort_atomic_write(inode, true);
return 0; return 0;
} }
@@ -1854,8 +1853,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 * until all the writers close its file. Since this should be done
* before dropping file lock, it needs to do in ->flush. * before dropping file lock, it needs to do in ->flush.
*/ */
if (f2fs_is_atomic_file(inode) && if (F2FS_I(inode)->atomic_write_task == current)
F2FS_I(inode)->atomic_write_task == current)
f2fs_abort_atomic_write(inode, true); f2fs_abort_atomic_write(inode, true);
return 0; return 0;
} }
@@ -2196,7 +2194,6 @@ static int f2fs_ioc_abort_atomic_write(struct file *filp)
inode_lock(inode); inode_lock(inode);
if (f2fs_is_atomic_file(inode))
f2fs_abort_atomic_write(inode, true); f2fs_abort_atomic_write(inode, true);
inode_unlock(inode); inode_unlock(inode);

1
fs/f2fs/inode.c
View File

@@ -744,7 +744,6 @@ void f2fs_evict_inode(struct inode *inode)
nid_t xnid = F2FS_I(inode)->i_xattr_nid; nid_t xnid = F2FS_I(inode)->i_xattr_nid;
int err = 0; 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); trace_f2fs_evict_inode(inode);

5
fs/f2fs/segment.c
View File

@@ -189,7 +189,9 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct f2fs_inode_info *fi = F2FS_I(inode); struct f2fs_inode_info *fi = F2FS_I(inode);
if (f2fs_is_atomic_file(inode)) { if (!f2fs_is_atomic_file(inode))
return;
if (clean) if (clean)
truncate_inode_pages_final(inode->i_mapping); truncate_inode_pages_final(inode->i_mapping);
clear_inode_flag(fi->cow_inode, FI_COW_FILE); clear_inode_flag(fi->cow_inode, FI_COW_FILE);
@@ -202,7 +204,6 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
sbi->atomic_files--; sbi->atomic_files--;
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]); spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
} }
}
static int __replace_atomic_write_block(struct inode *inode, pgoff_t index, static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,
block_t new_addr, block_t *old_addr, bool recover) block_t new_addr, block_t *old_addr, bool recover)

1
fs/f2fs/super.c
View File

@@ -1386,7 +1386,6 @@ static int f2fs_drop_inode(struct inode *inode)
atomic_inc(&inode->i_count); atomic_inc(&inode->i_count);
spin_unlock(&inode->i_lock); 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 */ /* should remain fi->extent_tree for writepage */