> @@ -2531,14 +2531,11 @@ static loff_t ocfs2_remap_file_range(struct file
> *file_in, loff_t pos_in,
> struct file *file_out, loff_t pos_out,
> loff_t len, unsigned int remap_flags)
> {
> - int ret;
> -
> if (!remap_check_flags(remap_flags, RFR_SAME_DATA))
> return -EINVAL;
>
> - ret = ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,
> - len, remap_flags);
> - return ret < 0 ? ret : len;
> + return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,
> + len, remap_flags);
Seems like ocfs2_remap_file_range and ocfs2_reflink_remap_range should
be merged now.
