Return-Path: Received: from mx143.netapp.com ([216.240.21.24]:35114 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754035AbbHGUic (ORCPT ); Fri, 7 Aug 2015 16:38:32 -0400 From: Anna Schumaker To: , , CC: Subject: [PATCH 4/7] VFS: Fall back on splice if no copy function defined Date: Fri, 7 Aug 2015 16:38:20 -0400 Message-ID: <1438979904-8775-5-git-send-email-Anna.Schumaker@Netapp.com> In-Reply-To: <1438979904-8775-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1438979904-8775-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: The NFS server will need a fallback for filesystems that don't have any kind of copy acceleration yet. Let's handle this by having vfs_copy_range() fall back to splice, enabling an in-kernel fallback for all filesystems. Signed-off-by: Anna Schumaker --- fs/read_write.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 3804547..e564a6b 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1358,7 +1358,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_in->f_op || !file_in->f_op->copy_file_range) + !file_in->f_op) return -EINVAL; inode_in = file_inode(file_in); @@ -1382,8 +1382,12 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (ret) return ret; - ret = file_in->f_op->copy_file_range(file_in, pos_in, file_out, pos_out, - len, flags); + ret = -ENOTSUPP; + if (file_in->f_op->copy_file_range) + ret = file_in->f_op->copy_file_range(file_in, pos_in, file_out, + pos_out, len, flags); + if (ret == -ENOTSUPP) + ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, len, flags); if (ret > 0) { fsnotify_access(file_in); add_rchar(current, ret); -- 2.5.0