Commit e53f8643 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: clean up f2fs_abort_atomic_write() 



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: default avatarChao Yu <chao.yu@oppo.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent bff139b4

fs/f2fs/file.c

+3 −6
Original line number Diff line number Diff line
@@ -1822,7 +1822,6 @@ 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);

	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,7 +2122,6 @@ 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);



	inode_unlock(inode);

fs/f2fs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -744,7 +744,6 @@ 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);



	trace_f2fs_evict_inode(inode);

fs/f2fs/segment.c

+14 −13
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ 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 (!f2fs_is_atomic_file(inode))

		return;



	if (clean)

		truncate_inode_pages_final(inode->i_mapping);

	clear_inode_flag(fi->cow_inode, FI_COW_FILE);
@@ -203,7 +205,6 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean) 
	sbi->atomic_files--;

	spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);

}

}



static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,

			block_t new_addr, block_t *old_addr, bool recover)

fs/f2fs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -1411,7 +1411,6 @@ 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);



			/* should remain fi->extent_tree for writepage */