From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:55658 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756488AbeEJB6g (ORCPT ); Wed, 9 May 2018 21:58:36 -0400 From: Goldwyn Rodrigues To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de, linux-unionfs@vger.kernel.org, david@fromorbit.com, viro@zeniv.linux.org.uk, Goldwyn Rodrigues Subject: [PATCH 4/4] ovl: Use do_copy_file_range() in copy_up_data() Date: Wed, 9 May 2018 20:58:20 -0500 Message-Id: <20180510015820.17700-5-rgoldwyn@suse.de> In-Reply-To: <20180510015820.17700-1-rgoldwyn@suse.de> References: <20180510015820.17700-1-rgoldwyn@suse.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Goldwyn Rodrigues This will preserve the holes by copying the chunks of data. If available it will use clone(). Signed-off-by: Goldwyn Rodrigues Reviewed-by: Amir Goldstein --- fs/overlayfs/copy_up.c | 28 ++++++++-------------------- fs/read_write.c | 10 ++++++---- include/linux/fs.h | 3 +++ 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index 8bede0742619..1f89380873ce 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -138,8 +138,7 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) { struct file *old_file; struct file *new_file; - loff_t old_pos = 0; - loff_t new_pos = 0; + loff_t pos = 0; int error = 0; if (len == 0) @@ -155,38 +154,27 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) goto out_fput; } - /* Try to use clone_file_range to clone up within the same fs */ - error = vfs_clone_file_range(old_file, 0, new_file, 0, len); - if (!error) - goto out; - /* Couldn't clone, so now we try to copy the data */ - error = 0; - - /* FIXME: copy up sparse files efficiently */ - while (len) { + while (pos < len) { size_t this_len = OVL_COPY_UP_CHUNK_SIZE; long bytes; - if (len < this_len) - this_len = len; + if (len - pos < this_len) + this_len = len - pos; if (signal_pending_state(TASK_KILLABLE, current)) { error = -EINTR; break; } - bytes = do_splice_direct(old_file, &old_pos, - new_file, &new_pos, - this_len, SPLICE_F_MOVE); + bytes = do_copy_file_range(old_file, pos, + new_file, pos, + this_len, 0, SPLICE_F_MOVE); if (bytes <= 0) { error = bytes; break; } - WARN_ON(old_pos != new_pos); - - len -= bytes; + pos += bytes; } -out: if (!error) error = vfs_fsync(new_file, 0); fput(new_file); diff --git a/fs/read_write.c b/fs/read_write.c index e765fec656af..50d7ef77410f 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1542,9 +1542,10 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, } #endif -static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in, +ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - size_t len, unsigned int flags) + size_t len, unsigned int flags, + unsigned int splice_flags) { struct inode *inode_in = file_inode(file_in); struct inode *inode_out = file_inode(file_out); @@ -1587,7 +1588,7 @@ static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in, if (size > len - total) size = len - total; ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out, - size, 0); + size, splice_flags); if (ret < 0) goto out; total += ret; @@ -1631,6 +1632,7 @@ static ssize_t do_copy_file_range(struct file *file_in, loff_t pos_in, out: return total ? total : ret; } +EXPORT_SYMBOL(do_copy_file_range); /* * copy_file_range() differs from regular file read and write in that it @@ -1669,7 +1671,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, file_start_write(file_out); ret = do_copy_file_range(file_in, pos_in, - file_out, pos_out, len, flags); + file_out, pos_out, len, flags, 0); if (ret > 0) { fsnotify_access(file_in); diff --git a/include/linux/fs.h b/include/linux/fs.h index 760d8da1b6c7..d5349b17fa10 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1799,6 +1799,9 @@ extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t vfs_readv(struct file *, const struct iovec __user *, unsigned long, loff_t *, rwf_t); +extern ssize_t do_copy_file_range(struct file *, loff_t , struct file *, + loff_t , size_t, unsigned int, + unsigned int); extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *, loff_t, size_t, unsigned int); extern int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in, -- 2.16.3