diff options
Diffstat (limited to 'fs/ocfs2/suballoc.h')
| -rw-r--r-- | fs/ocfs2/suballoc.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/ocfs2/suballoc.h b/fs/ocfs2/suballoc.h index e0f46df357e6..a017dd3ee7d9 100644 --- a/fs/ocfs2/suballoc.h +++ b/fs/ocfs2/suballoc.h | |||
| @@ -26,13 +26,14 @@ | |||
| 26 | #ifndef _CHAINALLOC_H_ | 26 | #ifndef _CHAINALLOC_H_ |
| 27 | #define _CHAINALLOC_H_ | 27 | #define _CHAINALLOC_H_ |
| 28 | 28 | ||
| 29 | struct ocfs2_suballoc_result; | ||
| 29 | typedef int (group_search_t)(struct inode *, | 30 | typedef int (group_search_t)(struct inode *, |
| 30 | struct buffer_head *, | 31 | struct buffer_head *, |
| 31 | u32, /* bits_wanted */ | 32 | u32, /* bits_wanted */ |
| 32 | u32, /* min_bits */ | 33 | u32, /* min_bits */ |
| 33 | u64, /* max_block */ | 34 | u64, /* max_block */ |
| 34 | u16 *, /* *bit_off */ | 35 | struct ocfs2_suballoc_result *); |
| 35 | u16 *); /* *bits_found */ | 36 | /* found bits */ |
| 36 | 37 | ||
| 37 | struct ocfs2_alloc_context { | 38 | struct ocfs2_alloc_context { |
| 38 | struct inode *ac_inode; /* which bitmap are we allocating from? */ | 39 | struct inode *ac_inode; /* which bitmap are we allocating from? */ |
| @@ -54,6 +55,8 @@ struct ocfs2_alloc_context { | |||
| 54 | u64 ac_last_group; | 55 | u64 ac_last_group; |
| 55 | u64 ac_max_block; /* Highest block number to allocate. 0 is | 56 | u64 ac_max_block; /* Highest block number to allocate. 0 is |
| 56 | is the same as ~0 - unlimited */ | 57 | is the same as ~0 - unlimited */ |
| 58 | |||
| 59 | struct ocfs2_alloc_reservation *ac_resv; | ||
| 57 | }; | 60 | }; |
| 58 | 61 | ||
| 59 | void ocfs2_init_steal_slots(struct ocfs2_super *osb); | 62 | void ocfs2_init_steal_slots(struct ocfs2_super *osb); |
| @@ -80,22 +83,21 @@ int ocfs2_reserve_clusters(struct ocfs2_super *osb, | |||
| 80 | u32 bits_wanted, | 83 | u32 bits_wanted, |
| 81 | struct ocfs2_alloc_context **ac); | 84 | struct ocfs2_alloc_context **ac); |
| 82 | 85 | ||
| 83 | int ocfs2_claim_metadata(struct ocfs2_super *osb, | 86 | int ocfs2_claim_metadata(handle_t *handle, |
| 84 | handle_t *handle, | ||
| 85 | struct ocfs2_alloc_context *ac, | 87 | struct ocfs2_alloc_context *ac, |
| 86 | u32 bits_wanted, | 88 | u32 bits_wanted, |
| 89 | u64 *suballoc_loc, | ||
| 87 | u16 *suballoc_bit_start, | 90 | u16 *suballoc_bit_start, |
| 88 | u32 *num_bits, | 91 | u32 *num_bits, |
| 89 | u64 *blkno_start); | 92 | u64 *blkno_start); |
| 90 | int ocfs2_claim_new_inode(struct ocfs2_super *osb, | 93 | int ocfs2_claim_new_inode(handle_t *handle, |
| 91 | handle_t *handle, | ||
| 92 | struct inode *dir, | 94 | struct inode *dir, |
| 93 | struct buffer_head *parent_fe_bh, | 95 | struct buffer_head *parent_fe_bh, |
| 94 | struct ocfs2_alloc_context *ac, | 96 | struct ocfs2_alloc_context *ac, |
| 97 | u64 *suballoc_loc, | ||
| 95 | u16 *suballoc_bit, | 98 | u16 *suballoc_bit, |
| 96 | u64 *fe_blkno); | 99 | u64 *fe_blkno); |
| 97 | int ocfs2_claim_clusters(struct ocfs2_super *osb, | 100 | int ocfs2_claim_clusters(handle_t *handle, |
| 98 | handle_t *handle, | ||
| 99 | struct ocfs2_alloc_context *ac, | 101 | struct ocfs2_alloc_context *ac, |
| 100 | u32 min_clusters, | 102 | u32 min_clusters, |
| 101 | u32 *cluster_start, | 103 | u32 *cluster_start, |
| @@ -104,8 +106,7 @@ int ocfs2_claim_clusters(struct ocfs2_super *osb, | |||
| 104 | * Use this variant of ocfs2_claim_clusters to specify a maxiumum | 106 | * Use this variant of ocfs2_claim_clusters to specify a maxiumum |
| 105 | * number of clusters smaller than the allocation reserved. | 107 | * number of clusters smaller than the allocation reserved. |
| 106 | */ | 108 | */ |
| 107 | int __ocfs2_claim_clusters(struct ocfs2_super *osb, | 109 | int __ocfs2_claim_clusters(handle_t *handle, |
| 108 | handle_t *handle, | ||
| 109 | struct ocfs2_alloc_context *ac, | 110 | struct ocfs2_alloc_context *ac, |
| 110 | u32 min_clusters, | 111 | u32 min_clusters, |
| 111 | u32 max_clusters, | 112 | u32 max_clusters, |