Unverified Commit 698baeae authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15544 ext4: fix race condition between ext4_write and ext4_convert_inline_data 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/JYVO555QX425EGIA5O54PJGGC4CLDRQC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP2JS 
 
Link:https://gitee.com/openeuler/kernel/pulls/15544

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 8a00c010 a2f4c271

fs/ext4/extents.c

+5 −3
Original line number Diff line number Diff line
@@ -5083,13 +5083,15 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
		     FALLOC_FL_INSERT_RANGE))

		return -EOPNOTSUPP;



	if (mode & FALLOC_FL_PUNCH_HOLE)

		return ext4_punch_hole(inode, offset, len);



	inode_lock(inode);

	ret = ext4_convert_inline_data(inode);

	inode_unlock(inode);

	if (ret)

		return ret;



	if (mode & FALLOC_FL_PUNCH_HOLE)

		return ext4_punch_hole(inode, offset, len);



	if (mode & FALLOC_FL_COLLAPSE_RANGE)

		return ext4_collapse_range(inode, offset, len);

fs/ext4/inode.c

+0 −9
Original line number Diff line number Diff line
@@ -4294,15 +4294,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length) 


	trace_ext4_punch_hole(inode, offset, length, 0);



	ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);

	if (ext4_has_inline_data(inode)) {

		down_write(&EXT4_I(inode)->i_mmap_sem);

		ret = ext4_convert_inline_data(inode);

		up_write(&EXT4_I(inode)->i_mmap_sem);

		if (ret)

			return ret;

	}



	/*

	 * Write out all dirty pages to avoid race conditions

	 * Then release them.