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

!9766 f2fs: compress: fix to cover {reserve,release}_compress_blocks() w/ cp_rwsem lock 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PIJTJRXFKJU54VMTYWJKBVDA26FCD4F6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA7YN0 
 
Link:https://gitee.com/openeuler/kernel/pulls/9766

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 84f20fcc fd5d027a

fs/f2fs/file.c

+10 −0
Original line number Diff line number Diff line
@@ -3579,9 +3579,12 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) 
		struct dnode_of_data dn;

		pgoff_t end_offset, count;



		f2fs_lock_op(sbi);



		set_new_dnode(&dn, inode, NULL, NULL, 0);

		ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE);

		if (ret) {

			f2fs_unlock_op(sbi);

			if (ret == -ENOENT) {

				page_idx = f2fs_get_next_page_offset(&dn,

								page_idx);
@@ -3599,6 +3602,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) 


		f2fs_put_dnode(&dn);



		f2fs_unlock_op(sbi);



		if (ret < 0)

			break;
@@ -3732,9 +3737,12 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) 
		struct dnode_of_data dn;

		pgoff_t end_offset, count;



		f2fs_lock_op(sbi);



		set_new_dnode(&dn, inode, NULL, NULL, 0);

		ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE);

		if (ret) {

			f2fs_unlock_op(sbi);

			if (ret == -ENOENT) {

				page_idx = f2fs_get_next_page_offset(&dn,

								page_idx);
@@ -3752,6 +3760,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) 


		f2fs_put_dnode(&dn);



		f2fs_unlock_op(sbi);



		if (ret < 0)

			break;