From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Date: Fri, 12 Oct 2018 17:07:05 -0700 [thread overview] Message-ID: <153938922552.8361.18136407106022565712.stgit@magnolia> (raw) In-Reply-To: <153938912912.8361.13446310416406388958.stgit@magnolia> From: Darrick J. Wong <darrick.wong@oracle.com> Pass the same remap flags to generic_remap_checks for consistency. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> --- fs/read_write.c | 2 +- include/linux/fs.h | 2 +- mm/filemap.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 5d24e9854765..0c43997bd4a1 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1755,7 +1755,7 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in, /* Check that we don't violate system file offset limits. */ ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len, - is_dedupe); + remap_flags); if (ret) return ret; diff --git a/include/linux/fs.h b/include/linux/fs.h index b67f108932a5..b59637b2f484 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2990,7 +2990,7 @@ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *); extern int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *count, bool is_dedupe); + uint64_t *count, unsigned int remap_flags); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *); diff --git a/mm/filemap.c b/mm/filemap.c index 08ad210fee49..c34a89a35d5a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3001,7 +3001,7 @@ EXPORT_SYMBOL(generic_write_checks); */ int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *req_count, bool is_dedupe) + uint64_t *req_count, unsigned int remap_flags) { struct inode *inode_in = file_in->f_mapping->host; struct inode *inode_out = file_out->f_mapping->host; @@ -3023,7 +3023,7 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, size_out = i_size_read(inode_out); /* Dedupe requires both ranges to be within EOF. */ - if (is_dedupe && + if ((remap_flags & RFR_SAME_DATA) && (pos_in >= size_in || pos_in + count > size_in || pos_out >= size_out || pos_out + count > size_out)) return -EINVAL;
WARNING: multiple messages have this Message-ID (diff)
From: Darrick J. Wong <darrick.wong@oracle.com> To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Date: Fri, 12 Oct 2018 17:07:05 -0700 [thread overview] Message-ID: <153938922552.8361.18136407106022565712.stgit@magnolia> (raw) In-Reply-To: <153938912912.8361.13446310416406388958.stgit@magnolia> From: Darrick J. Wong <darrick.wong@oracle.com> Pass the same remap flags to generic_remap_checks for consistency. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> --- fs/read_write.c | 2 +- include/linux/fs.h | 2 +- mm/filemap.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 5d24e9854765..0c43997bd4a1 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1755,7 +1755,7 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in, /* Check that we don't violate system file offset limits. */ ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len, - is_dedupe); + remap_flags); if (ret) return ret; diff --git a/include/linux/fs.h b/include/linux/fs.h index b67f108932a5..b59637b2f484 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2990,7 +2990,7 @@ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *); extern int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *count, bool is_dedupe); + uint64_t *count, unsigned int remap_flags); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *); diff --git a/mm/filemap.c b/mm/filemap.c index 08ad210fee49..c34a89a35d5a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3001,7 +3001,7 @@ EXPORT_SYMBOL(generic_write_checks); */ int generic_remap_checks(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, - uint64_t *req_count, bool is_dedupe) + uint64_t *req_count, unsigned int remap_flags) { struct inode *inode_in = file_in->f_mapping->host; struct inode *inode_out = file_out->f_mapping->host; @@ -3023,7 +3023,7 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in, size_out = i_size_read(inode_out); /* Dedupe requires both ranges to be within EOF. */ - if (is_dedupe && + if ((remap_flags & RFR_SAME_DATA) && (pos_in >= size_in || pos_in + count > size_in || pos_out >= size_out || pos_out + count > size_out)) return -EINVAL;
next prev parent reply other threads:[~2018-10-13 0:07 UTC|newest] Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-13 0:05 [PATCH v4 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:05 ` [PATCH 01/25] xfs: add a per-xfs trace_printk macro Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:05 ` [PATCH 02/25] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong 2018-10-13 0:05 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 03/25] vfs: check file ranges before cloning files Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 04/25] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 05/25] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:11 ` Christoph Hellwig 2018-10-14 17:11 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:06 ` [PATCH 06/25] vfs: skip zero-length dedupe requests Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 07/25] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:19 ` Christoph Hellwig 2018-10-14 17:19 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 6:04 ` Amir Goldstein 2018-10-15 12:47 ` Christoph Hellwig 2018-10-15 12:47 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 12:54 ` Amir Goldstein 2018-10-15 17:13 ` Darrick J. Wong 2018-10-15 17:13 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:32 ` Christoph Hellwig 2018-10-15 18:32 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 13:18 ` Matthew Wilcox 2018-10-15 16:42 ` Darrick J. Wong 2018-10-15 16:42 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 08/25] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 09/25] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:06 ` [PATCH 10/25] vfs: create generic_remap_file_range_touch to update inode metadata Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:21 ` Christoph Hellwig 2018-10-14 17:21 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 16:30 ` Darrick J. Wong 2018-10-15 16:30 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:19 ` Christoph Hellwig 2018-10-15 18:19 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:06 ` [PATCH 11/25] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong 2018-10-13 0:06 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:22 ` Christoph Hellwig 2018-10-14 17:22 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-14 17:37 ` Christoph Hellwig 2018-10-14 17:37 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-15 15:42 ` Darrick J. Wong 2018-10-15 15:42 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` Darrick J. Wong [this message] 2018-10-13 0:07 ` [Ocfs2-devel] [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Darrick J. Wong 2018-10-13 0:07 ` [PATCH 13/25] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 14/25] vfs: plumb RFR_* remap flags through the vfs clone functions Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` Darrick J. Wong 2018-10-13 0:07 ` [PATCH 15/25] vfs: plumb RFR_* remap flags through the vfs dedupe functions Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 16/25] vfs: make remapping to source file eof more explicit Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:24 ` Christoph Hellwig 2018-10-14 17:24 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-14 17:24 ` Christoph Hellwig 2018-10-14 17:24 ` Christoph Hellwig 2018-10-15 15:32 ` Darrick J. Wong 2018-10-15 15:32 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-15 18:28 ` Christoph Hellwig 2018-10-15 18:28 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:07 ` [PATCH 17/25] vfs: enable remap callers that can handle short operations Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:07 ` [PATCH 18/25] vfs: hide file range comparison function Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:43 ` Christoph Hellwig 2018-10-14 17:43 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:07 ` [PATCH 19/25] vfs: implement opportunistic short dedupe Darrick J. Wong 2018-10-13 0:07 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:26 ` Christoph Hellwig 2018-10-14 17:26 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:08 ` [PATCH 20/25] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 21/25] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 22/25] ocfs2: support partial clone range and dedupe range Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:41 ` Christoph Hellwig 2018-10-14 17:41 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-13 0:08 ` [PATCH 23/25] xfs: fix pagecache truncation prior to reflink Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 24/25] xfs: support returning partial reflink results Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-14 17:35 ` Christoph Hellwig 2018-10-14 17:35 ` [Ocfs2-devel] " Christoph Hellwig 2018-10-14 23:05 ` Dave Chinner 2018-10-14 23:05 ` [Ocfs2-devel] " Dave Chinner 2018-10-15 15:49 ` Darrick J. Wong 2018-10-15 15:49 ` [Ocfs2-devel] " Darrick J. Wong 2018-10-13 0:08 ` [PATCH 25/25] xfs: remove redundant remap partial EOF block checks Darrick J. Wong 2018-10-13 0:08 ` [Ocfs2-devel] " Darrick J. Wong -- strict thread matches above, loose matches on Subject: below -- 2018-10-11 4:12 [PATCH v3 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong 2018-10-11 4:13 ` [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Darrick J. Wong
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=153938922552.8361.18136407106022565712.stgit@magnolia \ --to=darrick.wong@oracle.com \ --cc=amir73il@gmail.com \ --cc=david@fromorbit.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-unionfs@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=ocfs2-devel@oss.oracle.com \ --cc=sandeen@redhat.com \ /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: linkBe 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.