diff mbox series

[15/17] nilfs2: Convert nilfs_make_empty() to use a folio

Message ID	20231127143036.2425-16-konishi.ryusuke@gmail.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; From: Ryusuke Konishi <konishi.ryusuke@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox <willy@infradead.org>, linux-kernel@vger.kernel.org Subject: [PATCH 15/17] nilfs2: Convert nilfs_make_empty() to use a folio Date: Mon, 27 Nov 2023 23:30:34 +0900 Message-Id: <20231127143036.2425-16-konishi.ryusuke@gmail.com> In-Reply-To: <20231127143036.2425-1-konishi.ryusuke@gmail.com> References: <20231127143036.2425-1-konishi.ryusuke@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	nilfs2: Folio conversions for directory paths \| [00/17] nilfs2: Folio conversions for directory paths [01/17] nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link [02/17] nilfs2: eliminate staggered calls to kunmap in nilfs_rename [03/17] nilfs2: Remove page_address() from nilfs_set_link [04/17] nilfs2: Remove page_address() from nilfs_add_link [05/17] nilfs2: Remove page_address() from nilfs_delete_entry [06/17] nilfs2: Return the mapped address from nilfs_get_page() [07/17] nilfs2: Pass the mapped address to nilfs_check_page() [08/17] nilfs2: Switch to kmap_local for directory handling [09/17] nilfs2: Add nilfs_get_folio() [10/17] nilfs2: Convert nilfs_readdir to use a folio [11/17] nilfs2: Convert nilfs_find_entry to use a folio [12/17] nilfs2: Convert nilfs_rename() to use folios [13/17] nilfs2: Convert nilfs_add_link() to use a folio [14/17] nilfs2: Convert nilfs_empty_dir() to use a folio [15/17] nilfs2: Convert nilfs_make_empty() to use a folio [16/17] nilfs2: Convert nilfs_prepare_chunk() and nilfs_commit_chunk() to folios [17/17] nilfs2: Convert nilfs_page_bug() to nilfs_folio_bug()

Commit Message

Ryusuke Konishi Nov. 27, 2023, 2:30 p.m. UTC

  From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Remove two calls to compound_head() and switch from kmap_atomic to
kmap_local.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
---
 fs/nilfs2/dir.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 919936d9ec27..ff0a009a292f 100644
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -559,21 +559,21 @@  int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct folio *folio)
 int nilfs_make_empty(struct inode *inode, struct inode *parent)
 {
 	struct address_space *mapping = inode->i_mapping;
-	struct page *page = grab_cache_page(mapping, 0);
+	struct folio *folio = filemap_grab_folio(mapping, 0);
 	unsigned int chunk_size = nilfs_chunk_size(inode);
 	struct nilfs_dir_entry *de;
 	int err;
 	void *kaddr;
 
-	if (!page)
-		return -ENOMEM;
+	if (IS_ERR(folio))
+		return PTR_ERR(folio);
 
-	err = nilfs_prepare_chunk(page, 0, chunk_size);
+	err = nilfs_prepare_chunk(&folio->page, 0, chunk_size);
 	if (unlikely(err)) {
-		unlock_page(page);
+		folio_unlock(folio);
 		goto fail;
 	}
-	kaddr = kmap_atomic(page);
+	kaddr = kmap_local_folio(folio, 0);
 	memset(kaddr, 0, chunk_size);
 	de = (struct nilfs_dir_entry *)kaddr;
 	de->name_len = 1;
@@ -588,10 +588,10 @@  int nilfs_make_empty(struct inode *inode, struct inode *parent)
 	de->inode = cpu_to_le64(parent->i_ino);
 	memcpy(de->name, "..\0", 4);
 	nilfs_set_de_type(de, inode);
-	kunmap_atomic(kaddr);
-	nilfs_commit_chunk(page, mapping, 0, chunk_size);
+	kunmap_local(kaddr);
+	nilfs_commit_chunk(&folio->page, mapping, 0, chunk_size);
 fail:
-	put_page(page);
+	folio_put(folio);
 	return err;
 }