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

!11712 btrfs: fix qgroup reserve leaks in cow_file_range 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5UBQXU7UWREV5ZBFKN7W4DZ7WCN65QUZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARV5C 
 
Link:https://gitee.com/openeuler/kernel/pulls/11712

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 1ab74ffe 48e5a75d

fs/btrfs/inode.c

+5 −1
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode, 
					     locked_page,

					     clear_bits,

					     page_ops);

		btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size);

		start += cur_alloc_size;

		if (start >= end)

			goto out;
@@ -1168,6 +1169,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode, 
	extent_clear_unlock_delalloc(inode, start, end, locked_page,

				     clear_bits | EXTENT_CLEAR_DATA_RESV,

				     page_ops);

	btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size);

	goto out;

}
@@ -1777,7 +1779,7 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode, 
	if (nocow)

		btrfs_dec_nocow_writers(fs_info, disk_bytenr);



	if (ret && cur_offset < end)

	if (ret && cur_offset < end) {

		extent_clear_unlock_delalloc(inode, cur_offset, end,

					     locked_page, EXTENT_LOCKED |

					     EXTENT_DELALLOC | EXTENT_DEFRAG |
@@ -1785,6 +1787,8 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode, 
					     PAGE_CLEAR_DIRTY |

					     PAGE_SET_WRITEBACK |

					     PAGE_END_WRITEBACK);

		btrfs_qgroup_free_data(inode, NULL, cur_offset, end - cur_offset + 1);

	}

	btrfs_free_path(path);

	return ret;

}