fs: assert on I_FREEING not being set in iput() and iput_not_last()

[PATCH] fs: assert on I_FREEING not being set in iput() and iput_not_last()

Posted by Mateusz Guzik 2 months, 1 week ago

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
---
 fs/inode.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/inode.c b/fs/inode.c
index cc8265cfe80e..521383223d8a 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1968,7 +1968,7 @@ void iput(struct inode *inode)
 
 retry:
 	lockdep_assert_not_held(&inode->i_lock);
-	VFS_BUG_ON_INODE(inode_state_read_once(inode) & I_CLEAR, inode);
+	VFS_BUG_ON_INODE(inode_state_read_once(inode) & (I_FREEING | I_CLEAR), inode);
 	/*
 	 * Note this assert is technically racy as if the count is bogusly
 	 * equal to one, then two CPUs racing to further drop it can both
@@ -2010,6 +2010,7 @@ EXPORT_SYMBOL(iput);
  */
 void iput_not_last(struct inode *inode)
 {
+	VFS_BUG_ON_INODE(inode_state_read_once(inode) & (I_FREEING | I_CLEAR), inode);
 	VFS_BUG_ON_INODE(atomic_read(&inode->i_count) < 2, inode);
 
 	WARN_ON(atomic_sub_return(1, &inode->i_count) == 0);
-- 
2.48.1

Re: [PATCH] fs: assert on I_FREEING not being set in iput() and iput_not_last()

Posted by Christian Brauner 2 months ago

On Mon, 01 Dec 2025 14:20:37 +0100, Mateusz Guzik wrote:
> 


Applied to the vfs.fixes branch of the vfs/vfs.git tree.
Patches in the vfs.fixes 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.fixes

[1/1] fs: assert on I_FREEING not being set in iput() and iput_not_last()
      https://git.kernel.org/vfs/vfs/c/aa8aba61d4e1

Re: [PATCH] fs: assert on I_FREEING not being set in iput() and iput_not_last()

Posted by Jan Kara 2 months ago

On Mon 01-12-25 14:20:37, Mateusz Guzik wrote:
> Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>

Makes sense. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/inode.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/inode.c b/fs/inode.c
> index cc8265cfe80e..521383223d8a 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -1968,7 +1968,7 @@ void iput(struct inode *inode)
>  
>  retry:
>  	lockdep_assert_not_held(&inode->i_lock);
> -	VFS_BUG_ON_INODE(inode_state_read_once(inode) & I_CLEAR, inode);
> +	VFS_BUG_ON_INODE(inode_state_read_once(inode) & (I_FREEING | I_CLEAR), inode);
>  	/*
>  	 * Note this assert is technically racy as if the count is bogusly
>  	 * equal to one, then two CPUs racing to further drop it can both
> @@ -2010,6 +2010,7 @@ EXPORT_SYMBOL(iput);
>   */
>  void iput_not_last(struct inode *inode)
>  {
> +	VFS_BUG_ON_INODE(inode_state_read_once(inode) & (I_FREEING | I_CLEAR), inode);
>  	VFS_BUG_ON_INODE(atomic_read(&inode->i_count) < 2, inode);
>  
>  	WARN_ON(atomic_sub_return(1, &inode->i_count) == 0);
> -- 
> 2.48.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR