From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org
Subject: [PATCH 02/14] fs: Make page_mkwrite_check_truncate thp-aware
Date: Wed, 14 Oct 2020 04:03:45 +0100 [thread overview]
Message-ID: <20201014030357.21898-3-willy@infradead.org> (raw)
In-Reply-To: <20201014030357.21898-1-willy@infradead.org>
If the page is compound, check the last index in the page and return
the appropriate size. Change the return type to ssize_t in case we ever
support pages larger than 2GB.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/pagemap.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 7dc6bf713d27..5083a0efafa8 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -983,22 +983,22 @@ static inline unsigned long dir_pages(struct inode *inode)
* @page: the page to check
* @inode: the inode to check the page against
*
- * Returns the number of bytes in the page up to EOF,
+ * Return: The number of bytes in the page up to EOF,
* or -EFAULT if the page was truncated.
*/
-static inline int page_mkwrite_check_truncate(struct page *page,
+static inline ssize_t page_mkwrite_check_truncate(struct page *page,
struct inode *inode)
{
loff_t size = i_size_read(inode);
pgoff_t index = size >> PAGE_SHIFT;
- int offset = offset_in_page(size);
+ unsigned long offset = offset_in_thp(page, size);
if (page->mapping != inode->i_mapping)
return -EFAULT;
/* page is wholly inside EOF */
- if (page->index < index)
- return PAGE_SIZE;
+ if (page->index + thp_nr_pages(page) - 1 < index)
+ return thp_size(page);
/* page is wholly past EOF */
if (page->index > index || !offset)
return -EFAULT;
--
2.28.0
next prev parent reply other threads:[~2020-10-14 9:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 3:03 [PATCH 00/14] Transparent Huge Page support for XFS Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 01/14] fs: Support THPs in vfs_dedupe_file_range Matthew Wilcox (Oracle)
2020-10-14 16:12 ` Darrick J. Wong
2020-10-14 17:16 ` Matthew Wilcox
2020-10-14 3:03 ` Matthew Wilcox (Oracle) [this message]
2020-10-14 16:17 ` [PATCH 02/14] fs: Make page_mkwrite_check_truncate thp-aware Darrick J. Wong
2020-10-14 17:23 ` Matthew Wilcox
2020-10-14 3:03 ` [PATCH 03/14] iomap: Support THPs in BIO completion path Matthew Wilcox (Oracle)
2020-10-15 9:50 ` Christoph Hellwig
2020-10-14 3:03 ` [PATCH 04/14] iomap: Support THPs in iomap_adjust_read_range Matthew Wilcox (Oracle)
2020-10-15 9:50 ` Christoph Hellwig
2020-10-14 3:03 ` [PATCH 05/14] iomap: Support THPs in invalidatepage Matthew Wilcox (Oracle)
2020-10-14 16:33 ` Darrick J. Wong
2020-10-14 17:26 ` Matthew Wilcox
2020-10-14 20:00 ` Brian Foster
2020-10-14 3:03 ` [PATCH 06/14] iomap: Support THPs in iomap_is_partially_uptodate Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 07/14] iomap: Support THPs in readpage Matthew Wilcox (Oracle)
2020-10-14 16:39 ` Darrick J. Wong
2020-10-14 17:35 ` Matthew Wilcox
2020-10-14 3:03 ` [PATCH 08/14] iomap: Support THPs in readahead Matthew Wilcox (Oracle)
2020-10-15 9:52 ` Christoph Hellwig
2020-10-14 3:03 ` [PATCH 09/14] iomap: Change iomap_write_begin calling convention Matthew Wilcox (Oracle)
2020-10-14 16:47 ` Darrick J. Wong
2020-10-14 17:41 ` Matthew Wilcox
2020-10-14 18:08 ` Matthew Wilcox
2020-10-14 3:03 ` [PATCH 10/14] iomap: Handle THPs when writing to pages Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 11/14] iomap: Support THP writeback Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 12/14] iomap: Inline data shouldn't see THPs Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 13/14] iomap: Handle tail pages in iomap_page_mkwrite Matthew Wilcox (Oracle)
2020-10-14 3:03 ` [PATCH 14/14] xfs: Support THPs Matthew Wilcox (Oracle)
2020-10-14 16:51 ` Darrick J. Wong
2020-10-14 17:30 ` Matthew Wilcox
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=20201014030357.21898-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).