All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	ntfs3@lists.linux.dev, linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 04/11] ntfs3: Convert ntfs_write_end() to work on a folio
Date: Mon, 22 Apr 2024 20:31:54 +0100	[thread overview]
Message-ID: <20240422193203.3534108-5-willy@infradead.org> (raw)
In-Reply-To: <20240422193203.3534108-1-willy@infradead.org>

Convert the passed page back into a folio and use the folio APIs, saving
a few hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/ntfs3/inode.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index b0299c7b59b4..e9c1cba44741 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -950,6 +950,7 @@ int ntfs_write_begin(struct file *file, struct address_space *mapping,
 int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
 		   u32 len, u32 copied, struct page *page, void *fsdata)
 {
+	struct folio *folio = page_folio(page);
 	struct inode *inode = mapping->host;
 	struct ntfs_inode *ni = ntfs_i(inode);
 	u64 valid = ni->i_valid;
@@ -961,23 +962,23 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
 		err = attr_data_write_resident(ni, page);
 		ni_unlock(ni);
 		if (!err) {
+			struct buffer_head *head = folio_buffers(folio);
 			dirty = true;
-			/* Clear any buffers in page. */
-			if (page_has_buffers(page)) {
-				struct buffer_head *head, *bh;
+			/* Clear any buffers in folio. */
+			if (head) {
+				struct buffer_head *bh = head;
 
-				bh = head = page_buffers(page);
 				do {
 					clear_buffer_dirty(bh);
 					clear_buffer_mapped(bh);
 					set_buffer_uptodate(bh);
 				} while (head != (bh = bh->b_this_page));
 			}
-			SetPageUptodate(page);
+			folio_mark_uptodate(folio);
 			err = copied;
 		}
-		unlock_page(page);
-		put_page(page);
+		folio_unlock(folio);
+		folio_put(folio);
 	} else {
 		err = generic_write_end(file, mapping, pos, len, copied, page,
 					fsdata);
-- 
2.43.0


  parent reply	other threads:[~2024-04-22 19:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-22 19:31 [PATCH v2 00/11] Convert (most of) ntfs3 to use folios Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 01/11] ntfs3: Convert ntfs_read_folio to use a folio Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 02/11] ntfs3: Convert ntfs_write_begin " Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 03/11] ntfs3: Convert attr_data_read_resident() to take " Matthew Wilcox (Oracle)
2024-04-22 19:31 ` Matthew Wilcox (Oracle) [this message]
2024-04-22 19:31 ` [PATCH v2 05/11] ntfs3: Convert attr_data_write_resident to use " Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 06/11] ntfs3: Convert attr_make_nonresident " Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 07/11] ntfs3: Convert inode_read_data() to use folios Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 08/11] ntfs3: Remove calls to set/clear the error flag Matthew Wilcox (Oracle)
2024-04-22 19:31 ` [PATCH v2 09/11] ntfs3: Convert attr_wof_frame_info() to use a folio Matthew Wilcox (Oracle)
2024-04-22 19:32 ` [PATCH v2 10/11] ntfs3: Convert ntfs_get_frame_pages() " Matthew Wilcox (Oracle)
2024-04-22 19:32 ` [PATCH v2 11/11] ntfs3: Convert ni_readpage_cmpr() to take " Matthew Wilcox (Oracle)
2024-04-23 14:51 ` [PATCH v2 00/11] Convert (most of) ntfs3 to use folios Konstantin Komarov

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=20240422193203.3534108-5-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=almaz.alexandrovich@paragon-software.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=ntfs3@lists.linux.dev \
    /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 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.