fs: push list presence check into inode_io_list_del()

For consistency with sb routines.

ext4 is the only consumer outside of evict(). Damage-controlling it is
outside of the scope of this cleanup.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Link: https://patch.msgid.link/20251103230911.516866-1-mjguzik@gmail.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index b864e9645f855438a1cd609f1ee961323b294522..bf978ece70b3ffb42f020e7cfb5b8b4a1809488a 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -202,8 +202,7 @@ void ext4_evict_inode(struct inode *inode)
         * the inode. Flush worker is ignoring it because of I_FREEING flag but
         * we still need to remove the inode from the writeback lists.
         */
-       if (!list_empty_careful(&inode->i_io_list))
-               inode_io_list_del(inode);
+       inode_io_list_del(inode);
 
        /*
         * Protect us against freezing - iput() caller didn't have to have any

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index c00b72e2d3392701c8b0ea7099bd0a261e902c55..917a450c503becd76c877ca9889fff3dbd7bb13f 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -1349,6 +1349,13 @@ void inode_io_list_del(struct inode *inode)
 {
        struct bdi_writeback *wb;
 
+       /*
+        * FIXME: ext4 can call here from ext4_evict_inode() after evict() already
+        * unlinked the inode.
+        */
+       if (list_empty_careful(&inode->i_io_list))
+               return;
+
        wb = inode_to_wb_and_lock_list(inode);
        spin_lock(&inode->i_lock);
 

diff --git a/fs/inode.c b/fs/inode.c
index 7229a56732c6d21e890c90caee18b2e81accf34e..970b1321c2b171fb13e3b30d5e4673f3fc35377a 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -818,9 +818,7 @@ static void evict(struct inode *inode)
        BUG_ON(!(inode_state_read_once(inode) & I_FREEING));
        BUG_ON(!list_empty(&inode->i_lru));
 
-       if (!list_empty(&inode->i_io_list))
-               inode_io_list_del(inode);
-
+       inode_io_list_del(inode);
        inode_sb_list_del(inode);
 
        spin_lock(&inode->i_lock);