lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 055/255] btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
    Date
    From: Nikolay Borisov <nborisov@suse.com>

    [ Upstream commit cfdd45921571eb24073e0737fa0bd44b4218f914 ]

    vfs_inode is used only for the inode number everything else requires
    btrfs_inode.

    Signed-off-by: Nikolay Borisov <nborisov@suse.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    [ use btrfs_ino ]
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/btrfs/inode.c | 2 +-
    fs/btrfs/qgroup.c | 14 +++++++-------
    fs/btrfs/qgroup.h | 2 +-
    3 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
    index 7ba1218b1630e..d932844d0e80a 100644
    --- a/fs/btrfs/inode.c
    +++ b/fs/btrfs/inode.c
    @@ -8640,7 +8640,7 @@ void btrfs_destroy_inode(struct inode *inode)
    btrfs_put_ordered_extent(ordered);
    }
    }
    - btrfs_qgroup_check_reserved_leak(inode);
    + btrfs_qgroup_check_reserved_leak(BTRFS_I(inode));
    inode_tree_del(inode);
    btrfs_drop_extent_cache(BTRFS_I(inode), 0, (u64)-1, 0);
    btrfs_inode_clear_file_extent_range(BTRFS_I(inode), 0, (u64)-1);
    diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
    index 5bd4089ad0e1a..574a669894774 100644
    --- a/fs/btrfs/qgroup.c
    +++ b/fs/btrfs/qgroup.c
    @@ -3742,7 +3742,7 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)
    * Check qgroup reserved space leaking, normally at destroy inode
    * time
    */
    -void btrfs_qgroup_check_reserved_leak(struct inode *inode)
    +void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)
    {
    struct extent_changeset changeset;
    struct ulist_node *unode;
    @@ -3750,19 +3750,19 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode)
    int ret;

    extent_changeset_init(&changeset);
    - ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
    + ret = clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
    EXTENT_QGROUP_RESERVED, &changeset);

    WARN_ON(ret < 0);
    if (WARN_ON(changeset.bytes_changed)) {
    ULIST_ITER_INIT(&iter);
    while ((unode = ulist_next(&changeset.range_changed, &iter))) {
    - btrfs_warn(BTRFS_I(inode)->root->fs_info,
    - "leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu",
    - inode->i_ino, unode->val, unode->aux);
    + btrfs_warn(inode->root->fs_info,
    + "leaking qgroup reserved space, ino: %llu, start: %llu, end: %llu",
    + btrfs_ino(inode), unode->val, unode->aux);
    }
    - btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
    - BTRFS_I(inode)->root->root_key.objectid,
    + btrfs_qgroup_free_refroot(inode->root->fs_info,
    + inode->root->root_key.objectid,
    changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);

    }
    diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
    index 1bc6544594690..406366f20cb0a 100644
    --- a/fs/btrfs/qgroup.h
    +++ b/fs/btrfs/qgroup.h
    @@ -399,7 +399,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root);
    */
    void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes);

    -void btrfs_qgroup_check_reserved_leak(struct inode *inode);
    +void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode);

    /* btrfs_qgroup_swapped_blocks related functions */
    void btrfs_qgroup_init_swapped_blocks(
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 17:42    [W:3.029 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site