Commit e8aec068 authored by Tristan Ye's avatar Tristan Ye Committed by Joel Becker
Browse files

Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing. 

Based on the previous patch of optimizing truncate, the bugfix for
refcount trees when punching holes can be fairly easy
and straightforward since most of work we should take into account for
refcounting have been completed already in ocfs2_remove_btree_range().

This patch performs CoW for refcounted extents when a hole being punched
whose start or end offset were in the middle of a cluster, which means
partial zeroing of the cluster will be performed soon.

The patch has been tested fixing the following bug:

http://oss.oracle.com/bugzilla/show_bug.cgi?id=1216



Signed-off-by: default avatarTristan Ye <tristan.ye@oracle.com>
Acked-by: default avatarMark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 78f94673

fs/ocfs2/file.c

+27 −3
Original line number Original line Diff line number Diff line
@@ -1422,12 +1422,14 @@ static int ocfs2_remove_inode_range(struct inode *inode, 
				    struct buffer_head *di_bh, u64 byte_start,

				    struct buffer_head *di_bh, u64 byte_start,

				    u64 byte_len)

				    u64 byte_len)

{

{

	int ret = 0;

	int ret = 0, flags = 0;

	u32 trunc_start, trunc_len, cpos, phys_cpos, alloc_size;

	u32 trunc_start, trunc_len, cpos, phys_cpos, alloc_size;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	struct ocfs2_cached_dealloc_ctxt dealloc;

	struct ocfs2_cached_dealloc_ctxt dealloc;

	struct address_space *mapping = inode->i_mapping;

	struct address_space *mapping = inode->i_mapping;

	struct ocfs2_extent_tree et;

	struct ocfs2_extent_tree et;

	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;

	u64 refcount_loc = le64_to_cpu(di->i_refcount_loc);





	ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);

	ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);

	ocfs2_init_dealloc_ctxt(&dealloc);

	ocfs2_init_dealloc_ctxt(&dealloc);
@@ -1453,6 +1455,27 @@ static int ocfs2_remove_inode_range(struct inode *inode, 
		goto out;

		goto out;

	}

	}





	/*

	 * For reflinks, we may need to CoW 2 clusters which might be

	 * partially zero'd later, if hole's start and end offset were

	 * within one cluster(means is not exactly aligned to clustersize).

	 */



	if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL) {



		ret = ocfs2_cow_file_pos(inode, di_bh, byte_start);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}



		ret = ocfs2_cow_file_pos(inode, di_bh, byte_start + byte_len);

		if (ret) {

			mlog_errno(ret);

			goto out;

		}

	}



	trunc_start = ocfs2_clusters_for_bytes(osb->sb, byte_start);

	trunc_start = ocfs2_clusters_for_bytes(osb->sb, byte_start);

	trunc_len = (byte_start + byte_len) >> osb->s_clustersize_bits;

	trunc_len = (byte_start + byte_len) >> osb->s_clustersize_bits;

	if (trunc_len >= trunc_start)

	if (trunc_len >= trunc_start)
@@ -1474,7 +1497,7 @@ static int ocfs2_remove_inode_range(struct inode *inode, 
	cpos = trunc_start;

	cpos = trunc_start;

	while (trunc_len) {

	while (trunc_len) {

		ret = ocfs2_get_clusters(inode, cpos, &phys_cpos,

		ret = ocfs2_get_clusters(inode, cpos, &phys_cpos,

					 &alloc_size, NULL);

					 &alloc_size, &flags);

		if (ret) {

		if (ret) {

			mlog_errno(ret);

			mlog_errno(ret);

			goto out;

			goto out;
@@ -1487,7 +1510,8 @@ static int ocfs2_remove_inode_range(struct inode *inode, 
		if (phys_cpos != 0) {

		if (phys_cpos != 0) {

			ret = ocfs2_remove_btree_range(inode, &et, cpos,

			ret = ocfs2_remove_btree_range(inode, &et, cpos,

						       phys_cpos, alloc_size,

						       phys_cpos, alloc_size,

						       0, &dealloc, 0);

						       flags, &dealloc,

						       refcount_loc);

			if (ret) {

			if (ret) {

				mlog_errno(ret);

				mlog_errno(ret);

				goto out;

				goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE