diff options
author | Josef Bacik <josef@redhat.com> | 2011-08-05 10:25:38 -0400 |
---|---|---|
committer | Josef Bacik <josef@redhat.com> | 2011-10-19 15:12:32 -0400 |
commit | 37be25bcb6d731914e126f8de59c4367f0d66b80 (patch) | |
tree | d9e78eb4440f60a7697f8f7c56a37c163734cf66 /fs/btrfs/ctree.h | |
parent | dba68306f3fae681b1005137f130f5bcfdfed34a (diff) |
Btrfs: kill the durable block rsv stuff
This is confusing code and isn't used by anything anymore, so delete it.
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4ef777e85c89..c5ceba4078cc 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -772,13 +772,10 @@ struct btrfs_space_info { | |||
772 | struct btrfs_block_rsv { | 772 | struct btrfs_block_rsv { |
773 | u64 size; | 773 | u64 size; |
774 | u64 reserved; | 774 | u64 reserved; |
775 | u64 freed[2]; | ||
776 | struct btrfs_space_info *space_info; | 775 | struct btrfs_space_info *space_info; |
777 | struct list_head list; | ||
778 | spinlock_t lock; | 776 | spinlock_t lock; |
779 | atomic_t usage; | 777 | atomic_t usage; |
780 | unsigned int priority:8; | 778 | unsigned int priority:8; |
781 | unsigned int durable:1; | ||
782 | unsigned int refill_used:1; | 779 | unsigned int refill_used:1; |
783 | unsigned int full:1; | 780 | unsigned int full:1; |
784 | }; | 781 | }; |
@@ -840,7 +837,6 @@ struct btrfs_block_group_cache { | |||
840 | spinlock_t lock; | 837 | spinlock_t lock; |
841 | u64 pinned; | 838 | u64 pinned; |
842 | u64 reserved; | 839 | u64 reserved; |
843 | u64 reserved_pinned; | ||
844 | u64 bytes_super; | 840 | u64 bytes_super; |
845 | u64 flags; | 841 | u64 flags; |
846 | u64 sectorsize; | 842 | u64 sectorsize; |
@@ -919,11 +915,6 @@ struct btrfs_fs_info { | |||
919 | 915 | ||
920 | struct btrfs_block_rsv empty_block_rsv; | 916 | struct btrfs_block_rsv empty_block_rsv; |
921 | 917 | ||
922 | /* list of block reservations that cross multiple transactions */ | ||
923 | struct list_head durable_block_rsv_list; | ||
924 | |||
925 | struct mutex durable_block_rsv_mutex; | ||
926 | |||
927 | u64 generation; | 918 | u64 generation; |
928 | u64 last_trans_committed; | 919 | u64 last_trans_committed; |
929 | 920 | ||
@@ -2238,8 +2229,6 @@ void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv); | |||
2238 | struct btrfs_block_rsv *btrfs_alloc_block_rsv(struct btrfs_root *root); | 2229 | struct btrfs_block_rsv *btrfs_alloc_block_rsv(struct btrfs_root *root); |
2239 | void btrfs_free_block_rsv(struct btrfs_root *root, | 2230 | void btrfs_free_block_rsv(struct btrfs_root *root, |
2240 | struct btrfs_block_rsv *rsv); | 2231 | struct btrfs_block_rsv *rsv); |
2241 | void btrfs_add_durable_block_rsv(struct btrfs_fs_info *fs_info, | ||
2242 | struct btrfs_block_rsv *rsv); | ||
2243 | int btrfs_block_rsv_add(struct btrfs_trans_handle *trans, | 2232 | int btrfs_block_rsv_add(struct btrfs_trans_handle *trans, |
2244 | struct btrfs_root *root, | 2233 | struct btrfs_root *root, |
2245 | struct btrfs_block_rsv *block_rsv, | 2234 | struct btrfs_block_rsv *block_rsv, |