Re: [PATCH 5/6] btrfs: Remove btrfs_inode from btrfs_delayed_inode_reserve_metadata

[Qu Wenruo]

On 2021/2/23 上午12:40, Nikolay Borisov wrote:

It's only used for tracepoint to obtain the ino, but we already have
the ino from btrfs_delayed_node::inode_id.

Signed-off-by: Nikolay Borisov <nbori...@suse.com>

Reviewed-by: Qu Wenruo <w...@suse.com>

Thanks,
Qu

---
  fs/btrfs/delayed-inode.c | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 6dcf2cd1b39e..875daca63d5d 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -602,7 +602,6 @@ static void btrfs_delayed_item_release_metadata(struct 
btrfs_root *root,
  static int btrfs_delayed_inode_reserve_metadata(
                                        struct btrfs_trans_handle *trans,
                                        struct btrfs_root *root,
-                                       struct btrfs_inode *inode,
                                        struct btrfs_delayed_node *node)
  {
        struct btrfs_fs_info *fs_info = root->fs_info;
@@ -647,7 +646,7 @@ static int btrfs_delayed_inode_reserve_metadata(
                        node->bytes_reserved = num_bytes;
                        trace_btrfs_space_reservation(fs_info,
                                                      "delayed_inode",
-                                                     btrfs_ino(inode),
+                                                     node->inode_id,
                                                      num_bytes, 1);
                } else {
                        btrfs_qgroup_free_meta_prealloc(root, num_bytes);
@@ -658,7 +657,7 @@ static int btrfs_delayed_inode_reserve_metadata(
        ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, true);
        if (!ret) {
                trace_btrfs_space_reservation(fs_info, "delayed_inode",
-                                             btrfs_ino(inode), num_bytes, 1);
+                                             node->inode_id, num_bytes, 1);
                node->bytes_reserved = num_bytes;
        }

@@ -1833,8 +1832,7 @@ int btrfs_delayed_update_inode(struct btrfs_trans_handle 
*trans,
                goto release_node;
        }

-       ret = btrfs_delayed_inode_reserve_metadata(trans, root, inode,
-                                                  delayed_node);
+       ret = btrfs_delayed_inode_reserve_metadata(trans, root, delayed_node);
        if (ret)
                goto release_node;