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

Commit b1967d0e authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: reverse inline-data truncate args 



ocfs2_truncate() and ocfs2_remove_inode_range() had reversed their "set
i_size" arguments to ocfs2_truncate_inline(). Fix things so that truncate
sets i_size, and punching a hole ignores it.

This exposed a problem where punching a hole in an inline-data file wasn't
updating the page cache, so fix that too.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 0d8a4e0c

fs/ocfs2/file.c

+15 −4
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int ocfs2_truncate_file(struct inode *inode, 


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

		status = ocfs2_truncate_inline(inode, di_bh, new_i_size,

					       i_size_read(inode), 0);

					       i_size_read(inode), 1);

		if (status)

			mlog_errno(status);
@@ -1521,6 +1521,7 @@ static int ocfs2_remove_inode_range(struct inode *inode, 
	u32 trunc_start, trunc_len, cpos, phys_cpos, alloc_size;

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

	struct ocfs2_cached_dealloc_ctxt dealloc;

	struct address_space *mapping = inode->i_mapping;



	ocfs2_init_dealloc_ctxt(&dealloc);
@@ -1529,10 +1530,20 @@ static int ocfs2_remove_inode_range(struct inode *inode, 


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

		ret = ocfs2_truncate_inline(inode, di_bh, byte_start,

					    byte_start + byte_len, 1);

		if (ret)

					    byte_start + byte_len, 0);

		if (ret) {

			mlog_errno(ret);

		return ret;

			goto out;

		}

		/*

		 * There's no need to get fancy with the page cache

		 * truncate of an inline-data inode. We're talking

		 * about less than a page here, which will be cached

		 * in the dinode buffer anyway.

		 */

		unmap_mapping_range(mapping, 0, 0, 0);

		truncate_inode_pages(mapping, 0);

		goto out;

	}



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