fs: retire stale lock ordering annotations from inode hash

[PATCH] fs: retire stale lock ordering annotations from inode hash

Posted by Mateusz Guzik 1 month, 3 weeks ago

1. iunique does not take the hash lock as of:
3f19b2ab97a97b41 ("vfs, afs, ext4: Make the inode hash table RCU searchable")
2. s_inode_list_lock is no longer taken under the hash lock as of:
c918f15420e336a9 ("fs: call inode_sb_list_add() outside of inode hash lock")

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
---
 fs/inode.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/inode.c b/fs/inode.c
index 39cb22e63d5b..2ebc3eff64fb 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -53,11 +53,7 @@
  *   inode->i_lock
  *
  * inode_hash_lock
- *   inode->i_sb->s_inode_list_lock
  *   inode->i_lock
- *
- * iunique_lock
- *   inode_hash_lock
  */
 
 static unsigned int i_hash_mask __ro_after_init;
-- 
2.48.1

Re: [PATCH] fs: retire stale lock ordering annotations from inode hash

Posted by Christian Brauner 1 month, 2 weeks ago

On Thu, 23 Apr 2026 19:04:31 +0200, Mateusz Guzik wrote:
> 1. iunique does not take the hash lock as of:
> 3f19b2ab97a97b41 ("vfs, afs, ext4: Make the inode hash table RCU searchable")
> 2. s_inode_list_lock is no longer taken under the hash lock as of:
> c918f15420e336a9 ("fs: call inode_sb_list_add() outside of inode hash lock")

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

[1/1] fs: retire stale lock ordering annotations from inode hash
      https://git.kernel.org/vfs/vfs/c/8edf31f99a20

Re: [PATCH] fs: retire stale lock ordering annotations from inode hash

Posted by Jan Kara 1 month, 2 weeks ago

On Thu 23-04-26 19:04:31, Mateusz Guzik wrote:
> 1. iunique does not take the hash lock as of:
> 3f19b2ab97a97b41 ("vfs, afs, ext4: Make the inode hash table RCU searchable")
> 2. s_inode_list_lock is no longer taken under the hash lock as of:
> c918f15420e336a9 ("fs: call inode_sb_list_add() outside of inode hash lock")
> 
> Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>

Looks good. Feel free to add:

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

								Honza

> ---
>  fs/inode.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/fs/inode.c b/fs/inode.c
> index 39cb22e63d5b..2ebc3eff64fb 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -53,11 +53,7 @@
>   *   inode->i_lock
>   *
>   * inode_hash_lock
> - *   inode->i_sb->s_inode_list_lock
>   *   inode->i_lock
> - *
> - * iunique_lock
> - *   inode_hash_lock
>   */
>  
>  static unsigned int i_hash_mask __ro_after_init;
> -- 
> 2.48.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR