Message ID | 20200610201345.13273-18-willy@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=G8WG=7X=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B8C114B7 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:14:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 481DB20848 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:14:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="PJFR2z3i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 481DB20848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2F4D48D0011; Wed, 10 Jun 2020 16:13:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1AD398D000E; Wed, 10 Jun 2020 16:13:53 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCFCC8D0012; Wed, 10 Jun 2020 16:13:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0160.hostedemail.com [216.40.44.160]) by kanga.kvack.org (Postfix) with ESMTP id AE7B38D000E for <linux-mm@kvack.org>; Wed, 10 Jun 2020 16:13:52 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6393F1A27C2 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:13:52 +0000 (UTC) X-FDA: 76914403104.17.nut44_371480726dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 37960180D0E90 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:13:52 +0000 (UTC) X-Spam-Summary: 2,0,0,ff29c638ff075a00,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:421:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3870:3871:4605:5007:6261:6630:6653:7576:8603:9036:10004:11026:11658:11914:12043:12114:12297:12438:12555:12895:13069:13161:13229:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21990:30034:30054:30070,0,RBL:198.137.202.133:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: nut44_371480726dce X-Filterd-Recvd-Size: 3164 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf18.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4figGncYPDs23Of7IYih6m6FXzxa/L1ppRPiwe0GXZ0=; b=PJFR2z3iqH2Nw5qEV5yTriVnR4 HHwB6hGy6N6yjAOR3migbMhFuAjDYBO6zIYCw/fNrcXicSxzoCBkGdnPHKmUgvpT3T7TDaLRyvaav JGyWQdEtV3qbBb8Akw6Oicgk1HRqEMSDKJxUuBiCo2XzUryuxUSF9ai14FYO7HMb5E4/Zviwb/xGA S7OwUAUqIjL/lz0EN8hcdX7VP/Url6U4TE9XF7AVlkVigU2+dimH6OoHYtq/2FFpNUe1FupIPkIOg 2atAbD5fBVz0PhB1Bm/qWf0zS8QyDPlrlJg1vM2oxmuuHtC7d1wQRZUWYh/wEa8J9je9BFvpqk0R4 ceJa2iyQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76Z-0003Ue-TO; Wed, 10 Jun 2020 20:13:47 +0000 From: Matthew Wilcox <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 17/51] fs: Make page_mkwrite_check_truncate thp-aware Date: Wed, 10 Jun 2020 13:13:11 -0700 Message-Id: <20200610201345.13273-18-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 37960180D0E90 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
Large pages in the page cache
|
expand
|
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 3ad0c92be649..f47ba9f18f3e 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -868,22 +868,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;