diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-10-30 10:42:56 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2018-10-30 10:42:56 +1100 |
| commit | 2587b1f1fae2d992de67e57b519f36e7c9ba70cd (patch) | |
| tree | 6ba10076889122b14e81806f75db884e5bbf0538 | |
| parent | 8c5c836bd6c3b9f9fc1c5a210d630b8c42f4f7df (diff) | |
| download | linux-2587b1f1fae2d992de67e57b519f36e7c9ba70cd.tar.bz2 | |
ocfs2: truncate page cache for clone destination file before remapping
When cloning blocks into another file, truncate the page cache before we
start remapping blocks so that concurrent reads wait for us to finish.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/ocfs2/refcounttree.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 46bbd315c39f..2a5c96bc9677 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -4861,14 +4861,12 @@ int ocfs2_reflink_remap_range(struct file *file_in, down_write_nested(&OCFS2_I(inode_out)->ip_alloc_sem, SINGLE_DEPTH_NESTING); - ret = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in, inode_out, - out_bh, pos_out, len); - /* Zap any page cache for the destination file's range. */ - if (!ret) - truncate_inode_pages_range(&inode_out->i_data, pos_out, - PAGE_ALIGN(pos_out + len) - 1); + truncate_inode_pages_range(&inode_out->i_data, pos_out, + PAGE_ALIGN(pos_out + len) - 1); + ret = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in, inode_out, + out_bh, pos_out, len); up_write(&OCFS2_I(inode_in)->ip_alloc_sem); if (!same_inode) up_write(&OCFS2_I(inode_out)->ip_alloc_sem); |