bcachefs: Change destroy_inode to free_inode
authorYouling Tang <tangyouling@kylinos.cn>
Fri, 26 Apr 2024 07:29:56 +0000 (15:29 +0800)
committerKent Overstreet <kent.overstreet@linux.dev>
Wed, 8 May 2024 21:29:21 +0000 (17:29 -0400)
The vfs[1] documentation describes free_inode as follows:
```
free_inode
    this method is called from RCU callback. If you use call_rcu()
    in ->destroy_inode to free ‘struct inode’ memory, then it’s
    better to release memory in this method.
```

free_inode will be called by the RCU callback, so it might be better
to move the inode free operation to destroy_inode.

Similar to commit ae6b47b5653e ("fs/ntfs3: Change destroy_inode to
free_inode").

Link:
[1]: https://www.kernel.org/doc/html/latest/filesystems/vfs.html

Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/fs.c

index 138d416a64d5aec6df4727a1734f885a5bb6f26d..a8d71cec1c174a0bb65f2f536ffc9004e3e9c148 100644 (file)
@@ -1523,17 +1523,9 @@ static void bch2_vfs_inode_init(struct btree_trans *trans, subvol_inum inum,
        mapping_set_large_folios(inode->v.i_mapping);
 }
 
-static void bch2_i_callback(struct rcu_head *head)
+static void bch2_free_inode(struct inode *vinode)
 {
-       struct inode *vinode = container_of(head, struct inode, i_rcu);
-       struct bch_inode_info *inode = to_bch_ei(vinode);
-
-       kmem_cache_free(bch2_inode_cache, inode);
-}
-
-static void bch2_destroy_inode(struct inode *vinode)
-{
-       call_rcu(&vinode->i_rcu, bch2_i_callback);
+       kmem_cache_free(bch2_inode_cache, to_bch_ei(vinode));
 }
 
 static int inode_update_times_fn(struct btree_trans *trans,
@@ -1841,7 +1833,7 @@ static int bch2_unfreeze(struct super_block *sb)
 
 static const struct super_operations bch_super_operations = {
        .alloc_inode    = bch2_alloc_inode,
-       .destroy_inode  = bch2_destroy_inode,
+       .free_inode     = bch2_free_inode,
        .write_inode    = bch2_vfs_write_inode,
        .evict_inode    = bch2_evict_inode,
        .sync_fs        = bch2_sync_fs,