Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

f2fs: make atomic/volatile operation exclusive 



atomic/volatile ioctl interfaces are exposed to user like other file
operation interface, it needs to make them getting exclusion against
to each other to avoid potential conflict among these operations
in concurrent scenario.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 7fb17fe4

fs/f2fs/file.c

+16 −0
Original line number Diff line number Diff line
@@ -1363,6 +1363,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) 
	if (ret)

		return ret;



	inode_lock(inode);



	if (f2fs_is_atomic_file(inode))

		goto out;
@@ -1383,6 +1385,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) 
	if (ret)

		clear_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);

out:

	inode_unlock(inode);

	mnt_drop_write_file(filp);

	return ret;

}
@@ -1399,6 +1402,8 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp) 
	if (ret)

		return ret;



	inode_lock(inode);



	if (f2fs_is_volatile_file(inode))

		goto err_out;
@@ -1413,6 +1418,7 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp) 


	ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);

err_out:

	inode_unlock(inode);

	mnt_drop_write_file(filp);

	return ret;

}
@@ -1429,6 +1435,8 @@ static int f2fs_ioc_start_volatile_write(struct file *filp) 
	if (ret)

		return ret;



	inode_lock(inode);



	if (f2fs_is_volatile_file(inode))

		goto out;
@@ -1439,6 +1447,7 @@ static int f2fs_ioc_start_volatile_write(struct file *filp) 
	set_inode_flag(F2FS_I(inode), FI_VOLATILE_FILE);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

out:

	inode_unlock(inode);

	mnt_drop_write_file(filp);

	return ret;

}
@@ -1455,6 +1464,8 @@ static int f2fs_ioc_release_volatile_write(struct file *filp) 
	if (ret)

		return ret;



	inode_lock(inode);



	if (!f2fs_is_volatile_file(inode))

		goto out;
@@ -1465,6 +1476,7 @@ static int f2fs_ioc_release_volatile_write(struct file *filp) 


	ret = punch_hole(inode, 0, F2FS_BLKSIZE);

out:

	inode_unlock(inode);

	mnt_drop_write_file(filp);

	return ret;

}
@@ -1481,6 +1493,8 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp) 
	if (ret)

		return ret;



	inode_lock(inode);



	if (f2fs_is_atomic_file(inode))

		drop_inmem_pages(inode);

	if (f2fs_is_volatile_file(inode)) {
@@ -1488,6 +1502,8 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp) 
		ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);

	}



	inode_unlock(inode);



	mnt_drop_write_file(filp);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	return ret;