|
@@ -4861,14 +4861,12 @@ int ocfs2_reflink_remap_range(struct file *file_in,
|
|
down_write_nested(&OCFS2_I(inode_out)->ip_alloc_sem,
|
|
down_write_nested(&OCFS2_I(inode_out)->ip_alloc_sem,
|
|
SINGLE_DEPTH_NESTING);
|
|
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. */
|
|
/* 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);
|
|
up_write(&OCFS2_I(inode_in)->ip_alloc_sem);
|
|
if (!same_inode)
|
|
if (!same_inode)
|
|
up_write(&OCFS2_I(inode_out)->ip_alloc_sem);
|
|
up_write(&OCFS2_I(inode_out)->ip_alloc_sem);
|