All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <linux-nfs@vger.kernel.org>, <linux-btrfs@vger.kernel.org>,
	<linux-fsdevel@vger.kernel.org>, <linux-api@vger.kernel.org>,
	<zab@zabbo.net>, <viro@zeniv.linux.org.uk>, <clm@fb.com>,
	<darrick.wong@oracle.com>, <mtk.manpages@gmail.com>,
	<andros@netapp.com>, <hch@infradead.org>
Subject: [PATCH v1 7/8] vfs: Copy should use file_out rather than file_in
Date: Fri, 4 Sep 2015 16:17:01 -0400	[thread overview]
Message-ID: <1441397823-1203-8-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1441397823-1203-1-git-send-email-Anna.Schumaker@Netapp.com>

The way to think about this is that the destination filesystem reads the
data from the source file and processes it accordingly.  This is
especially important to avoid an infinate loop when doing a "server to
server" copy on NFS.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 fs/read_write.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index 59637ed..9dafb7f 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1355,7 +1355,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_out->f_op || !file_out->f_op->copy_file_range)
 		return -EBADF;
 
 	inode_in = file_inode(file_in);
@@ -1377,8 +1377,8 @@ 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 = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out,
+					      len, flags);
 	if (ret > 0) {
 		fsnotify_access(file_in);
 		add_rchar(current, ret);
-- 
2.5.1


WARNING: multiple messages have this Message-ID (diff)
From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: linux-nfs@vger.kernel.org, linux-btrfs@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org,
	zab@zabbo.net, viro@zeniv.linux.org.uk, clm@fb.com,
	darrick.wong@oracle.com, mtk.manpages@gmail.com,
	andros@netapp.com, hch@infradead.org
Subject: [PATCH v1 7/8] vfs: Copy should use file_out rather than file_in
Date: Fri, 4 Sep 2015 16:17:01 -0400	[thread overview]
Message-ID: <1441397823-1203-8-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1441397823-1203-1-git-send-email-Anna.Schumaker@Netapp.com>

The way to think about this is that the destination filesystem reads the
data from the source file and processes it accordingly.  This is
especially important to avoid an infinate loop when doing a "server to
server" copy on NFS.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 fs/read_write.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/read_write.c b/fs/read_write.c
index 59637ed..9dafb7f 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1355,7 +1355,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_out->f_op || !file_out->f_op->copy_file_range)
 		return -EBADF;
 
 	inode_in = file_inode(file_in);
@@ -1377,8 +1377,8 @@ 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 = file_out->f_op->copy_file_range(file_in, pos_in, file_out, pos_out,
+					      len, flags);
 	if (ret > 0) {
 		fsnotify_access(file_in);
 		add_rchar(current, ret);
-- 
2.5.1


  parent reply	other threads:[~2015-09-04 20:17 UTC|newest]

Thread overview: 121+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-04 20:16 [PATCH v1 0/8] VFS: In-kernel copy system call Anna Schumaker
2015-09-04 20:16 ` Anna Schumaker
2015-09-04 20:16 ` Anna Schumaker
2015-09-04 20:16 ` [PATCH v1 1/9] vfs: add copy_file_range syscall and vfs helper Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 21:50   ` Darrick J. Wong
2015-09-04 20:16 ` [PATCH v1 2/8] x86: add sys_copy_file_range to syscall tables Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 20:16 ` [PATCH v1 3/8] btrfs: add .copy_file_range file operation Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 21:02   ` Josef Bacik
2015-09-04 21:02     ` Josef Bacik
2015-09-04 21:02     ` Josef Bacik
2015-09-09  8:39   ` David Sterba
2015-09-04 20:16 ` [PATCH v1 4/8] btrfs: Add mountpoint checking during btrfs_copy_file_range Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-09  9:18   ` David Sterba
2015-09-09 15:56     ` Anna Schumaker
2015-09-09 15:56       ` Anna Schumaker
2015-09-04 20:16 ` [PATCH v1 5/8] vfs: Remove copy_file_range mountpoint checks Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 20:16   ` Anna Schumaker
2015-09-04 20:17 ` [PATCH v1 6/8] vfs: Copy should check len after file open mode Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 20:17 ` Anna Schumaker [this message]
2015-09-04 20:17   ` [PATCH v1 7/8] vfs: Copy should use file_out rather than file_in Anna Schumaker
2015-09-04 20:17 ` [PATCH v1 8/8] vfs: Fall back on splice if no copy function defined Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 21:08   ` Darrick J. Wong
2015-09-08 14:57     ` Anna Schumaker
2015-09-08 14:57       ` Anna Schumaker
2015-09-08 14:57       ` Anna Schumaker
2015-09-04 20:17 ` [PATCH v1 9/8] copy_file_range.2: New page documenting copy_file_range() Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 20:17   ` Anna Schumaker
2015-09-04 21:38   ` Darrick J. Wong
2015-09-04 22:31     ` Andreas Dilger
2015-09-04 22:31       ` Andreas Dilger
2015-09-08 15:05       ` Anna Schumaker
2015-09-08 15:05         ` Anna Schumaker
2015-09-08 15:05         ` Anna Schumaker
2015-09-08 15:04     ` Anna Schumaker
2015-09-08 15:04       ` Anna Schumaker
2015-09-08 15:04       ` Anna Schumaker
2015-09-08 20:39       ` Darrick J. Wong
2015-09-09  9:16         ` David Sterba
2015-09-09 11:38         ` Austin S Hemmelgarn
2015-09-09 11:38           ` Austin S Hemmelgarn
2015-09-09 17:17           ` Darrick J. Wong
2015-09-09 17:31             ` Anna Schumaker
2015-09-09 17:31               ` Anna Schumaker
2015-09-09 17:31               ` Anna Schumaker
2015-09-09 18:12               ` Darrick J. Wong
2015-09-09 18:12                 ` Darrick J. Wong
2015-09-09 19:25                 ` Anna Schumaker
2015-09-09 19:25                   ` Anna Schumaker
2015-09-10 15:42             ` David Sterba
2015-09-10 15:42               ` David Sterba
2015-09-10 16:43               ` Darrick J. Wong
2015-09-10 16:43                 ` Darrick J. Wong
2015-09-04 22:25 ` [PATCH v1 0/8] VFS: In-kernel copy system call Andreas Dilger
2015-09-04 22:25   ` Andreas Dilger
2015-09-05  8:33   ` Al Viro
2015-09-05  8:33     ` Al Viro
2015-09-08 15:08     ` Anna Schumaker
2015-09-08 15:08       ` Anna Schumaker
2015-09-08 15:08       ` Anna Schumaker
2015-09-08 20:45       ` Darrick J. Wong
2015-09-08 20:49         ` Anna Schumaker
2015-09-08 20:49           ` Anna Schumaker
2015-09-08 20:49           ` Anna Schumaker
2015-09-08 15:07   ` Anna Schumaker
2015-09-08 15:07     ` Anna Schumaker
2015-09-08 15:21 ` Pádraig Brady
2015-09-08 15:21   ` Pádraig Brady
2015-09-08 18:23   ` Anna Schumaker
2015-09-08 18:23     ` Anna Schumaker
2015-09-08 19:10     ` Andy Lutomirski
2015-09-08 19:10       ` Andy Lutomirski
2015-09-08 20:03       ` Pádraig Brady
2015-09-08 20:03         ` Pádraig Brady
2015-09-08 21:29         ` Darrick J. Wong
2015-09-08 21:29           ` Darrick J. Wong
2015-09-08 21:45           ` Andy Lutomirski
2015-09-08 21:45             ` Andy Lutomirski
2015-09-08 22:39             ` Darrick J. Wong
2015-09-08 22:39               ` Darrick J. Wong
2015-09-08 23:08               ` Andy Lutomirski
2015-09-08 23:08                 ` Andy Lutomirski
2015-09-09  1:19                 ` Darrick J. Wong
2015-09-09  1:19                   ` Darrick J. Wong
2015-09-09 20:09                 ` Chris Mason
2015-09-09 20:26                   ` Trond Myklebust
2015-09-09 20:26                     ` Trond Myklebust
2015-09-09 20:38                     ` Chris Mason
2015-09-09 20:38                       ` Chris Mason
2015-09-09 20:41                       ` Anna Schumaker
2015-09-09 20:41                         ` Anna Schumaker
2015-09-09 21:42                         ` Darrick J. Wong
2015-09-09 21:42                           ` Darrick J. Wong
2015-09-09 20:37                   ` Andy Lutomirski
2015-09-09 20:37                     ` Andy Lutomirski
2015-09-09 20:42                     ` Chris Mason
2015-09-09 20:42                       ` Chris Mason
2015-09-13 23:25                 ` Dave Chinner
2015-09-13 23:25                   ` Dave Chinner
2015-09-14 17:53                   ` Andy Lutomirski
2015-09-14 17:53                     ` Andy Lutomirski
2015-09-09 18:52               ` Anna Schumaker
2015-09-09 18:52                 ` Anna Schumaker
2015-09-09 21:16                 ` Darrick J. Wong
2015-09-09 21:16                   ` Darrick J. Wong
2015-09-10 15:10                   ` Anna Schumaker
2015-09-10 15:10                     ` Anna Schumaker
2015-09-10 15:49                     ` Austin S Hemmelgarn
2015-09-10 15:49                       ` Austin S Hemmelgarn
2015-09-10 11:40                 ` Austin S Hemmelgarn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441397823-1203-8-git-send-email-Anna.Schumaker@Netapp.com \
    --to=anna.schumaker@netapp.com \
    --cc=andros@netapp.com \
    --cc=clm@fb.com \
    --cc=darrick.wong@oracle.com \
    --cc=hch@infradead.org \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=mtk.manpages@gmail.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=zab@zabbo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.