|
@@ -1354,8 +1354,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
|
|
|
|
|
|
if (!(file_in->f_mode & FMODE_READ) ||
|
|
|
!(file_out->f_mode & FMODE_WRITE) ||
|
|
|
- (file_out->f_flags & O_APPEND) ||
|
|
|
- !file_out->f_op->copy_file_range)
|
|
|
+ (file_out->f_flags & O_APPEND))
|
|
|
return -EBADF;
|
|
|
|
|
|
/* this could be relaxed once a method supports cross-fs copies */
|
|
@@ -1369,8 +1368,14 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out,
|
|
|
- len, flags);
|
|
|
+ ret = -EOPNOTSUPP;
|
|
|
+ if (file_out->f_op->copy_file_range)
|
|
|
+ ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out,
|
|
|
+ pos_out, len, flags);
|
|
|
+ if (ret == -EOPNOTSUPP)
|
|
|
+ ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out,
|
|
|
+ len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);
|
|
|
+
|
|
|
if (ret > 0) {
|
|
|
fsnotify_access(file_in);
|
|
|
add_rchar(current, ret);
|