diff options
author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2015-11-10 16:53:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-01 14:00:55 -0500 |
commit | eac70053a141998c40907747d6cea1d53a9414be (patch) | |
tree | 67b51897837e7e031727afd38596e9d5eb10e196 | |
parent | 3db11b2eecc02dc0eee943e71822c6d929281aa7 (diff) |
vfs: Add vfs_copy_file_range() support for pagecache copies
This allows us to have an in-kernel copy mechanism that avoids frequent
switches between kernel and user space. This is especially useful so
NFSD can support server-side copies.
The default (flags=0) means to first attempt copy acceleration, but use
the pagecache if that fails.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Padraig Brady <P@draigBrady.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/read_write.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 173140029a7a..c81ef394a3d4 100644 --- a/fs/read_write.c +++ b/fs/read_write.c | |||
@@ -1354,8 +1354,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, | |||
1354 | 1354 | ||
1355 | if (!(file_in->f_mode & FMODE_READ) || | 1355 | if (!(file_in->f_mode & FMODE_READ) || |
1356 | !(file_out->f_mode & FMODE_WRITE) || | 1356 | !(file_out->f_mode & FMODE_WRITE) || |
1357 | (file_out->f_flags & O_APPEND) || | 1357 | (file_out->f_flags & O_APPEND)) |
1358 | !file_out->f_op->copy_file_range) | ||
1359 | return -EBADF; | 1358 | return -EBADF; |
1360 | 1359 | ||
1361 | /* this could be relaxed once a method supports cross-fs copies */ | 1360 | /* 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, | |||
1369 | if (ret) | 1368 | if (ret) |
1370 | return ret; | 1369 | return ret; |
1371 | 1370 | ||
1372 | ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out, | 1371 | ret = -EOPNOTSUPP; |
1373 | len, flags); | 1372 | if (file_out->f_op->copy_file_range) |
1373 | ret = file_out->f_op->copy_file_range(file_in, pos_in, file_out, | ||
1374 | pos_out, len, flags); | ||
1375 | if (ret == -EOPNOTSUPP) | ||
1376 | ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, | ||
1377 | len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0); | ||
1378 | |||
1374 | if (ret > 0) { | 1379 | if (ret > 0) { |
1375 | fsnotify_access(file_in); | 1380 | fsnotify_access(file_in); |
1376 | add_rchar(current, ret); | 1381 | add_rchar(current, ret); |