From mboxrd@z Thu Jan 1 00:00:00 1970 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 DF56EC7EE43 for ; Tue, 6 Jun 2023 22:35:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240005AbjFFWf4 (ORCPT ); Tue, 6 Jun 2023 18:35:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240011AbjFFWfE (ORCPT ); Tue, 6 Jun 2023 18:35:04 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544D81FD9 for ; Tue, 6 Jun 2023 15:34:24 -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=wQrcPHV7vyzosYNSVJuqrneg4cIS2V5NV+LCC9FM5LM=; b=DTFt0vkChR5TvvuTUOedW23ixu vclu8fIt+yT8MTfFIRyf6YjBN0IU+68yI7ycpR/xqtiRLbS7YeuViqETH0E/MRvJU8lNm2FEBoWFZ 4jXb6jLzHzLagSxgKWyboPQ/9+VcRv1gLKkfeda6qEZ/ldD9MdNdf2brKPxqOPLdfbzESg6IpqCLu LXC2yoL4+IWF4WMaFBsf9rHCuBC14AaDqWVVYNZd8Jd5/Nkn5RzAjJf+8aK00lRUJptsTokd5Dk3z Ysy0zk22Sdqd4QEeLlplpzm/DxKY9k9rzbp+XzbAGhUvJZl9bukQGxnkGIG81WVJuLuj/ieqRJ+Mh exXfqGmA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1q6fFV-00DbEv-8M; Tue, 06 Jun 2023 22:33:57 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , cluster-devel@redhat.com, Hannes Reinecke , Luis Chamberlain , Andrew Morton , Andreas Gruenbacher Subject: [PATCH v2 07/14] buffer: Convert block_page_mkwrite() to use a folio Date: Tue, 6 Jun 2023 23:33:39 +0100 Message-Id: <20230606223346.3241328-8-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230606223346.3241328-1-willy@infradead.org> References: <20230606223346.3241328-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org If any page in a folio is dirtied, dirty the entire folio. Removes a number of hidden calls to compound_head() and references to page->mapping and page->index. Signed-off-by: Matthew Wilcox (Oracle) --- fs/buffer.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index d8c2c000676b..f34ed29b1085 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2564,38 +2564,37 @@ EXPORT_SYMBOL(block_commit_write); int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, get_block_t get_block) { - struct page *page = vmf->page; + struct folio *folio = page_folio(vmf->page); struct inode *inode = file_inode(vma->vm_file); unsigned long end; loff_t size; int ret; - lock_page(page); + folio_lock(folio); size = i_size_read(inode); - if ((page->mapping != inode->i_mapping) || - (page_offset(page) > size)) { + if ((folio->mapping != inode->i_mapping) || + (folio_pos(folio) > size)) { /* We overload EFAULT to mean page got truncated */ ret = -EFAULT; goto out_unlock; } - /* page is wholly or partially inside EOF */ - if (((page->index + 1) << PAGE_SHIFT) > size) - end = size & ~PAGE_MASK; - else - end = PAGE_SIZE; + end = folio_size(folio); + /* folio is wholly or partially inside EOF */ + if (folio_pos(folio) + end > size) + end = size - folio_pos(folio); - ret = __block_write_begin(page, 0, end, get_block); + ret = __block_write_begin_int(folio, 0, end, get_block, NULL); if (!ret) - ret = block_commit_write(page, 0, end); + ret = block_commit_write(&folio->page, 0, end); if (unlikely(ret < 0)) goto out_unlock; - set_page_dirty(page); - wait_for_stable_page(page); + folio_set_dirty(folio); + folio_wait_stable(folio); return 0; out_unlock: - unlock_page(page); + folio_unlock(folio); return ret; } EXPORT_SYMBOL(block_page_mkwrite); -- 2.39.2