Skip to content

Commit e108c86

Browse files
committed
btrfs: switch btrfs_block_group::inode to struct btrfs_inode
The structure is internal so we should use struct btrfs_inode for that. Reviewed-by: Boris Burkov <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 8610ba7 commit e108c86

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

fs/btrfs/block-group.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4356,13 +4356,13 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info)
43564356
spin_lock(&block_group->lock);
43574357
if (test_and_clear_bit(BLOCK_GROUP_FLAG_IREF,
43584358
&block_group->runtime_flags)) {
4359-
struct inode *inode = block_group->inode;
4359+
struct btrfs_inode *inode = block_group->inode;
43604360

43614361
block_group->inode = NULL;
43624362
spin_unlock(&block_group->lock);
43634363

43644364
ASSERT(block_group->io_ctl.inode == NULL);
4365-
iput(inode);
4365+
iput(&inode->vfs_inode);
43664366
} else {
43674367
spin_unlock(&block_group->lock);
43684368
}

fs/btrfs/block-group.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct btrfs_caching_control {
115115

116116
struct btrfs_block_group {
117117
struct btrfs_fs_info *fs_info;
118-
struct inode *inode;
118+
struct btrfs_inode *inode;
119119
spinlock_t lock;
120120
u64 start;
121121
u64 length;

fs/btrfs/free-space-cache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,
137137

138138
spin_lock(&block_group->lock);
139139
if (block_group->inode)
140-
inode = igrab(block_group->inode);
140+
inode = igrab(&block_group->inode->vfs_inode);
141141
spin_unlock(&block_group->lock);
142142
if (inode)
143143
return inode;
@@ -156,7 +156,7 @@ struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,
156156
}
157157

158158
if (!test_and_set_bit(BLOCK_GROUP_FLAG_IREF, &block_group->runtime_flags))
159-
block_group->inode = igrab(inode);
159+
block_group->inode = BTRFS_I(igrab(inode));
160160
spin_unlock(&block_group->lock);
161161

162162
return inode;

0 commit comments

Comments
 (0)