On Thu, Apr 30, 2009 at 06:58:18AM +0800, Tao Ma wrote:
> Add a new operation eo_ocfs2_extent_contig int extent tree's
I assume you mean 'in the extent tree's operations vector'.
> operation. So that with the new refcount tree, we can calculate
> whether they are contiguous in its own function.
"We want this so that refcount trees can always return
CONTIG_NONE and prevent extent merging".
> Signed-off-by: Tao Ma <[email protected]>
> ---
> fs/ocfs2/alloc.c | 57 ++++++++++++++++++++++++++++++++++++++---------------
> 1 files changed, 41 insertions(+), 16 deletions(-)
>
> diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
> index 0c96b27..1fc56f3 100644
> --- a/fs/ocfs2/alloc.c
> +++ b/fs/ocfs2/alloc.c
> @@ -53,7 +53,17 @@
> #include "buffer_head_io.h"
> #include "refcounttree.h"
>
> +enum ocfs2_contig_type {
> + CONTIG_NONE = 0,
> + CONTIG_LEFT,
> + CONTIG_RIGHT,
> + CONTIG_LEFTRIGHT,
> +};
>
> +static enum ocfs2_contig_type
> + ocfs2_extent_rec_contig(struct super_block *sb,
> + struct ocfs2_extent_rec *ext,
> + struct ocfs2_extent_rec *insert_rec);
> /*
> * Operations for a specific extent tree type.
> *
> @@ -123,6 +133,16 @@ struct ocfs2_extent_tree_operations {
> * to 0 (unlimited). Optional.
> */
> void (*eo_fill_max_leaf_clusters)(struct ocfs2_extent_tree *et);
> +
> + /*
> + * ->eo_ocfs2_extent_contig test whether the 2 ocfs2_extent_rec
> + * are contiguous or not. Optional. Don't need to set it if use
> + * ocfs2_extent_rec as the tree leaf.
> + */
> + enum ocfs2_contig_type
> + (*eo_ocfs2_extent_contig)(struct super_block *sb,
> + struct ocfs2_extent_rec *ext,
> + struct ocfs2_extent_rec *insert_rec);
> };
>
>
> @@ -386,6 +406,9 @@ static void __ocfs2_init_extent_tree(struct
> ocfs2_extent_tree *et,
> et->et_max_leaf_clusters = 0;
> else
> et->et_ops->eo_fill_max_leaf_clusters(et);
> +
> + if (!et->et_ops->eo_ocfs2_extent_contig)
> + et->et_ops->eo_ocfs2_extent_contig = ocfs2_extent_rec_contig;
> }
>
> void ocfs2_init_dinode_extent_tree(struct ocfs2_extent_tree *et,
> @@ -459,6 +482,16 @@ static inline int ocfs2_et_root_journal_access(handle_t
> *handle,
> type);
> }
>
> +static inline enum ocfs2_contig_type
> + ocfs2_et_extent_contig(struct ocfs2_extent_tree *et,
> + struct ocfs2_extent_rec *ext,
> + struct ocfs2_extent_rec *insert_rec)
> +{
> + return et->et_ops->eo_ocfs2_extent_contig(
> + ocfs2_metadata_cache_get_super(et->et_ci),
> + ext, insert_rec);
> +}
> +
> static inline int ocfs2_et_insert_check(struct ocfs2_extent_tree *et,
> struct ocfs2_extent_rec *rec)
> {
> @@ -731,17 +764,9 @@ int ocfs2_search_extent_list(struct ocfs2_extent_list
> *el, u32 v_cluster)
> return ret;
> }
>
> -enum ocfs2_contig_type {
> - CONTIG_NONE = 0,
> - CONTIG_LEFT,
> - CONTIG_RIGHT,
> - CONTIG_LEFTRIGHT,
> -};
> -
> -
> /*
> * NOTE: ocfs2_block_extent_contig(), ocfs2_extents_adjacent() and
> - * ocfs2_extent_contig only work properly against leaf nodes!
> + * ocfs2_extent_rec_contig only work properly against leaf nodes!
> */
> static int ocfs2_block_extent_contig(struct super_block *sb,
> struct ocfs2_extent_rec *ext,
> @@ -767,9 +792,9 @@ static int ocfs2_extents_adjacent(struct ocfs2_extent_rec
> *left,
> }
>
> static enum ocfs2_contig_type
> - ocfs2_extent_contig(struct super_block *sb,
> - struct ocfs2_extent_rec *ext,
> - struct ocfs2_extent_rec *insert_rec)
> + ocfs2_extent_rec_contig(struct super_block *sb,
> + struct ocfs2_extent_rec *ext,
> + struct ocfs2_extent_rec *insert_rec)
> {
> u64 blkno = le64_to_cpu(insert_rec->e_blkno);
>
> @@ -4294,7 +4319,7 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree
> *et,
> if (split_rec->e_cpos == el->l_recs[index].e_cpos)
> ret = CONTIG_RIGHT;
> } else {
> - ret = ocfs2_extent_contig(sb, rec, split_rec);
> + ret = ocfs2_et_extent_contig(et, rec, split_rec);
> }
> }
>
> @@ -4339,7 +4364,7 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree
> *et,
> if (rec) {
> enum ocfs2_contig_type contig_type;
>
> - contig_type = ocfs2_extent_contig(sb, rec, split_rec);
> + contig_type = ocfs2_et_extent_contig(et, rec, split_rec);
>
> if (contig_type == CONTIG_LEFT && ret == CONTIG_RIGHT)
> ret = CONTIG_LEFTRIGHT;
> @@ -4367,8 +4392,8 @@ static void ocfs2_figure_contig_type(struct
> ocfs2_extent_tree *et,
> BUG_ON(le16_to_cpu(el->l_tree_depth) != 0);
>
> for(i = 0; i < le16_to_cpu(el->l_next_free_rec); i++) {
> - contig_type =
> ocfs2_extent_contig(ocfs2_metadata_cache_get_super(et->et_ci),
> - &el->l_recs[i], insert_rec);
> + contig_type = ocfs2_et_extent_contig(et, &el->l_recs[i],
> + insert_rec);
> if (contig_type != CONTIG_NONE) {
> insert->ins_contig_index = i;
> break;
> --
> 1.6.2.rc2.16.gf474c
>
>
> _______________________________________________
> Ocfs2-devel mailing list
> [email protected]
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel
--
Life's Little Instruction Book #226
"When someone hugs you, let them be the first to let go."
Joel Becker
Principal Software Developer
Oracle
E-mail: [email protected]
Phone: (650) 506-8127
_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
