diff options
author | Yan Zheng <zheng.yan@oracle.com> | 2008-12-11 16:30:39 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-12-11 16:30:39 -0500 |
commit | d2fb3437e4d8d12c73c587615ad187d5288547ec (patch) | |
tree | 894e4c698970dd35226b2614b8a38fb8a96580e7 /fs/btrfs/btrfs_inode.h | |
parent | cfc8ea87201dc9bb6aeb3fc80c61abee83e7cc06 (diff) |
Btrfs: fix leaking block group on balance
The block group structs are referenced in many different
places, and it's not safe to free while balancing. So, those block
group structs were simply leaked instead.
This patch replaces the block group pointer in the inode with the starting byte
offset of the block group and adds reference counting to the block group
struct.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs/btrfs/btrfs_inode.h')
-rw-r--r-- | fs/btrfs/btrfs_inode.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 1b9ec1ab1f68..a8c9693b75ac 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h | |||
@@ -28,11 +28,6 @@ struct btrfs_inode { | |||
28 | /* which subvolume this inode belongs to */ | 28 | /* which subvolume this inode belongs to */ |
29 | struct btrfs_root *root; | 29 | struct btrfs_root *root; |
30 | 30 | ||
31 | /* the block group preferred for allocations. This pointer is buggy | ||
32 | * and needs to be replaced with a bytenr instead | ||
33 | */ | ||
34 | struct btrfs_block_group_cache *block_group; | ||
35 | |||
36 | /* key used to find this inode on disk. This is used by the code | 31 | /* key used to find this inode on disk. This is used by the code |
37 | * to read in roots of subvolumes | 32 | * to read in roots of subvolumes |
38 | */ | 33 | */ |
@@ -115,6 +110,9 @@ struct btrfs_inode { | |||
115 | */ | 110 | */ |
116 | u64 index_cnt; | 111 | u64 index_cnt; |
117 | 112 | ||
113 | /* the start of block group preferred for allocations. */ | ||
114 | u64 block_group; | ||
115 | |||
118 | struct inode vfs_inode; | 116 | struct inode vfs_inode; |
119 | }; | 117 | }; |
120 | 118 | ||