[4/7] sysv: Convert sysv_delete_entry() to work on a folio

Commit Message

Matthew Wilcox July 9, 2024, 3:03 p.m. UTC

Match ext2 and remove a few hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <[e-mail]>
---
 fs/sysv/dir.c   | 14 +++++++-------
 fs/sysv/namei.c |  4 ++--
 fs/sysv/sysv.h  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

Patch

diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index ebccf7bb5b69..0b5727510bdd 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -231,20 +231,20 @@  int sysv_add_link(struct dentry *dentry, struct inode *inode)
 	goto out_folio;
 }
 
-int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
+int sysv_delete_entry(struct sysv_dir_entry *de, struct folio *folio)
 {
-	struct inode *inode = page->mapping->host;
-	loff_t pos = page_offset(page) + offset_in_page(de);
+	struct inode *inode = folio->mapping->host;
+	loff_t pos = folio_pos(folio) + offset_in_folio(folio, de);
 	int err;
 
-	lock_page(page);
-	err = sysv_prepare_chunk(page, pos, SYSV_DIRSIZE);
+	folio_lock(folio);
+	err = sysv_prepare_chunk(&folio->page, pos, SYSV_DIRSIZE);
 	if (err) {
-		unlock_page(page);
+		folio_unlock(folio);
 		return err;
 	}
 	de->inode = 0;
-	dir_commit_chunk(page, pos, SYSV_DIRSIZE);
+	dir_commit_chunk(&folio->page, pos, SYSV_DIRSIZE);
 	inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 	mark_inode_dirty(inode);
 	return sysv_handle_dirsync(inode);
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index ef4d91431225..fb8bd8437872 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -159,7 +159,7 @@  static int sysv_unlink(struct inode * dir, struct dentry * dentry)
 	if (!de)
 		return -ENOENT;
 
-	err = sysv_delete_entry(de, &folio->page);
+	err = sysv_delete_entry(de, folio);
 	if (!err) {
 		inode_set_ctime_to_ts(inode, inode_get_ctime(dir));
 		inode_dec_link_count(inode);
@@ -242,7 +242,7 @@  static int sysv_rename(struct mnt_idmap *idmap, struct inode *old_dir,
 			inode_inc_link_count(new_dir);
 	}
 
-	err = sysv_delete_entry(old_de, &old_folio->page);
+	err = sysv_delete_entry(old_de, old_folio);
 	if (err)
 		goto out_dir;
 
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
index ee90af7dbed9..fec9f6b883d5 100644
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
@@ -150,7 +150,7 @@  extern void sysv_destroy_icache(void);
 /* dir.c */
 struct sysv_dir_entry *sysv_find_entry(struct dentry *, struct folio **);
 int sysv_add_link(struct dentry *, struct inode *);
-int sysv_delete_entry(struct sysv_dir_entry *, struct page *);
+int sysv_delete_entry(struct sysv_dir_entry *, struct folio *);
 int sysv_make_empty(struct inode *, struct inode *);
 int sysv_empty_dir(struct inode *);
 int sysv_set_link(struct sysv_dir_entry *, struct folio *,