vfs: Remove unnecessary list_for_each_entry_safe() from evict_inodes()
Jan Kara
reviewerPATCH 1/1 vfs: Remove unnecessary list_for_each_entry_safe() from evict_inodes()
evict_inodes() uses list_for_each_entry_safe() to iterate sb->s_inodes list. However, since we use i_lru list entry for our local temporary list of inodes to destroy, the inode is guaranteed to stay in sb->s_inodes list while we hold sb->s_inode_list_lock. So there is no real need for safe iteration variant and we can use list_for_each_entry() just fine.
--- fs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Small cleanup I have sitting in my tree for ages and which I think is still worth it.
fs/inode.c +2 -2
@@ -865,12 +865,12 @@ static void dispose_list(struct list_head *head)*/ void evict_inodes (struct super_block *sb) { -struct inode *inode, *next; +struct inode *inode;LIST_HEAD (dispose); again:spin_lock (&sb->s_inode_list_lock); -list_for_each_entry_safe (inode, next, &sb->s_inodes, i_sb_list) { +list_for_each_entry (inode, &sb->s_inodes, i_sb_list) {if (atomic_read (&inode->i_count))continue ;
Signature · 1 line
2.43.0
Quoted 6 lines · Jan Kara
evict_inodes()useslist_for_each_entry_safe()to iteratesb->s_inodeslist. However, since we usei_lrulist entry for our local temporary list of inodes to destroy, the inode is guaranteed to stay insb->s_inodeslist while we holdsb->s_inode_list_lock. So there is no real need for safe iteration variant and we can uselist_for_each_entry()just fine.
Yes, agreed, this is safe. I thought it wasn't, because (a) we call inode_lru_list_del(), but that's a different list (i_lru, not i_sb_list) and (b) we call dispose() which calls evict(), but if we do that, we restart the list walk.
Quoted 1 line
Signed-off-by Jan Kara <[email protected]>
Quoted 8 lines · Jan Kara
evict_inodes()useslist_for_each_entry_safe()to iteratesb->s_inodeslist. However, since we usei_lrulist entry for our local temporary list of inodes to destroy, the inode is guaranteed to stay insb->s_inodeslist while we holdsb->s_inode_list_lock. So there is no real need for safe iteration variant and we can uselist_for_each_entry()just fine.[...]
Applied to the vfs-6.17.misc branch of the vfs/vfs.git tree. Patches in the vfs-6.17.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.17.misc
[1/1] vfs: Remove unnecessary list_for_each_entry_safe() from evict_inodes()
https://git.kernel.org/vfs/vfs/c/3bc4e4410830