From patchwork Mon Aug 21 14:36:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13359522 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74B73EE49AB for ; Mon, 21 Aug 2023 14:36:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236016AbjHUOgu (ORCPT ); Mon, 21 Aug 2023 10:36:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235973AbjHUOgu (ORCPT ); Mon, 21 Aug 2023 10:36:50 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60087E4; Mon, 21 Aug 2023 07:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=NhZK7lLhyk1gRe/kDzCl/6wBwOFUa/J4bfVtj1z1BGk=; b=eNEjOezjN6kQuPgAnyxqBYTVWz k4DDHfNjz1NDeaMOMV3/UDBgmM5vQwKdTEvctgz4C0d7t15HnSmx7bNcGeHtGOb5KQw/zOHyDXd+9 nZST91BEoOsJFE1HqOuGhoekfKQ2HDthTZVT9PMcBi1Art/66k3HunYauTjVAGvEBGKJ1YsxgZUvh WfPEdzW5AcPugdyVEROQcb98ksbqo2nWgZBErr4TnnW6cA7kwdNjBWUCawMkOiVNXlgNFyum3lzf4 pNx6ku2fTcskSbD7lsBn1JlfL/stCKAYFsFmxlAuQB3a4VlhEJbvOv/V2MywO+eCpJ75cwhEK2iEp Dd3JAr8g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qY61M-00Aj4B-9K; Mon, 21 Aug 2023 14:36:44 +0000 From: "Matthew Wilcox (Oracle)" To: Xiubo Li Cc: "Matthew Wilcox (Oracle)" , Ilya Dryomov , Jeff Layton , ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/2] mm: Delete page_mkwrite_check_truncate() Date: Mon, 21 Aug 2023 15:36:40 +0100 Message-Id: <20230821143640.2556497-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230821143640.2556497-1-willy@infradead.org> References: <20230821143640.2556497-1-willy@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org All users of this function have been converted to folio_mkwrite_check_truncate(). Remove it. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 351c3b7f93a1..f43a0e05b092 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1491,34 +1491,6 @@ static inline ssize_t folio_mkwrite_check_truncate(struct folio *folio, return offset; } -/** - * page_mkwrite_check_truncate - check if page was truncated - * @page: the page to check - * @inode: the inode to check the page against - * - * Returns 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, - struct inode *inode) -{ - loff_t size = i_size_read(inode); - pgoff_t index = size >> PAGE_SHIFT; - int offset = offset_in_page(size); - - if (page->mapping != inode->i_mapping) - return -EFAULT; - - /* page is wholly inside EOF */ - if (page->index < index) - return PAGE_SIZE; - /* page is wholly past EOF */ - if (page->index > index || !offset) - return -EFAULT; - /* page is partially inside EOF */ - return offset; -} - /** * i_blocks_per_folio - How many blocks fit in this folio. * @inode: The inode which contains the blocks.