[ Sasha's backport helper bot ]
Hi,
Summary of potential issues and notes:
The upstream commit SHA1 provided is correct: 584db20c181f5e28c0386d7987406ace7fbd3e49
Note: The patch differs from the upstream commit:
---
1: 584db20c181f5 ! 1: 670766cc49f85 nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link
@@ Metadata
## Commit message ##
nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link
+ commit 584db20c181f5e28c0386d7987406ace7fbd3e49 upstream.
+
Patch series "nilfs2: Folio conversions for directory paths".
This series applies page->folio conversions to nilfs2 directory
@@ Commit message
sizes, both on machines with and without highmem mapping. No issues
found.
-
This patch (of 17):
In a few directory operations, the call to nilfs_put_page() for a page
@@ Commit message
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
+ Stable-dep-of: ee70999a988b ("nilfs2: handle errors that nilfs_prepare_chunk() may return")
## fs/nilfs2/dir.c ##
@@ fs/nilfs2/dir.c: static inline unsigned int nilfs_chunk_size(struct inode *inode)
@@ fs/nilfs2/dir.c: static inline unsigned int nilfs_chunk_size(struct inode *inode
/*
* Return the offset into page `page_nr' of the last valid
* byte in that page, plus one.
-@@ fs/nilfs2/dir.c: ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
- return res;
+@@ fs/nilfs2/dir.c: int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)
+ return 0;
}
-/* Releases the page */
@@ fs/nilfs2/dir.c: void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *
nilfs_set_de_type(de, inode);
nilfs_commit_chunk(page, mapping, from, to);
- nilfs_put_page(page);
- inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
+ dir->i_mtime = inode_set_ctime_current(dir);
}
@@ fs/nilfs2/dir.c: int nilfs_add_link(struct dentry *dentry, struct inode *inode)
@@ fs/nilfs2/dir.c: int nilfs_add_link(struct dentry *dentry, struct inode *inode)
{
@@ fs/nilfs2/dir.c: int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page)
nilfs_commit_chunk(page, mapping, from, to);
- inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
+ inode->i_mtime = inode_set_ctime_current(inode);
out:
- nilfs_put_page(page);
return err;
@@ fs/nilfs2/namei.c: static int nilfs_do_unlink(struct inode *dir, struct dentry *
goto out;
@@ fs/nilfs2/namei.c: static int nilfs_rename(struct mnt_idmap *idmap,
- if (!new_de)
goto out_dir;
+ }
nilfs_set_link(new_dir, new_de, new_page, old_inode);
+ nilfs_put_page(new_page);
nilfs_mark_inode_dirty(new_dir);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
