ocfs2: Add extent tree operation for xattr value btrees

Add some thin wrappers around ocfs2_insert_extent() for each of the 3
different btree types, ocfs2_inode_insert_extent(),
ocfs2_xattr_value_insert_extent() and ocfs2_xattr_tree_insert_extent(). The
last is for the xattr index btree, which will be used in a followup patch.

All the old callers in file.c etc will call ocfs2_dinode_insert_extent(),
while the other two handle the xattr issue. And the init of extent tree are
handled by these functions.

When storing xattr value which is too large, we will allocate some clusters
for it and here ocfs2_extent_list and ocfs2_extent_rec will also be used. In
order to re-use the b-tree operation code, a new parameter named "private"
is added into ocfs2_extent_tree and it is used to indicate the root of
ocfs2_exent_list. The reason is that we can't deduce the root from the
buffer_head now. It may be in an inode, an ocfs2_xattr_block or even worse,
in any place in an ocfs2_xattr_bucket.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

1 files changed, 28 insertions, 14 deletions

diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h
index 5e090c5d8498..ec7baeb2ea7d 100644
--- a/fs/ocfs2/alloc.h
+++ b/fs/ocfs2/alloc.h
@@ -28,19 +28,29 @@
 
 enum ocfs2_extent_tree_type {
         OCFS2_DINODE_EXTENT = 0,
+        OCFS2_XATTR_VALUE_EXTENT,
 };
 
 struct ocfs2_alloc_context;
-int ocfs2_insert_extent(struct ocfs2_super *osb,
-                        handle_t *handle,
-                        struct inode *inode,
-                        struct buffer_head *root_bh,
-                        u32 cpos,
-                        u64 start_blk,
-                        u32 new_clusters,
-                        u8 flags,
-                        struct ocfs2_alloc_context *meta_ac,
-                        enum ocfs2_extent_tree_type et_type);
+int ocfs2_dinode_insert_extent(struct ocfs2_super *osb,
+                               handle_t *handle,
+                               struct inode *inode,
+                               struct buffer_head *root_bh,
+                               u32 cpos,
+                               u64 start_blk,
+                               u32 new_clusters,
+                               u8 flags,
+                               struct ocfs2_alloc_context *meta_ac);
+int ocfs2_xattr_value_insert_extent(struct ocfs2_super *osb,
+                                    handle_t *handle,
+                                    struct inode *inode,
+                                    struct buffer_head *root_bh,
+                                    u32 cpos,
+                                    u64 start_blk,
+                                    u32 new_clusters,
+                                    u8 flags,
+                                    struct ocfs2_alloc_context *meta_ac,
+                                    void *private);
 enum ocfs2_alloc_restarted {
         RESTART_NONE = 0,
         RESTART_TRANS,
@@ -57,22 +67,26 @@ int ocfs2_add_clusters_in_btree(struct ocfs2_super *osb,
                                 struct ocfs2_alloc_context *data_ac,
                                 struct ocfs2_alloc_context *meta_ac,
                                 enum ocfs2_alloc_restarted *reason_ret,
-                                enum ocfs2_extent_tree_type type);
+                                enum ocfs2_extent_tree_type type,
+                                void *private);
 struct ocfs2_cached_dealloc_ctxt;
 int ocfs2_mark_extent_written(struct inode *inode, struct buffer_head *root_bh,
                               handle_t *handle, u32 cpos, u32 len, u32 phys,
                               struct ocfs2_alloc_context *meta_ac,
                               struct ocfs2_cached_dealloc_ctxt *dealloc,
-                              enum ocfs2_extent_tree_type et_type);
+                              enum ocfs2_extent_tree_type et_type,
+                              void *private);
 int ocfs2_remove_extent(struct inode *inode, struct buffer_head *root_bh,
                         u32 cpos, u32 len, handle_t *handle,
                         struct ocfs2_alloc_context *meta_ac,
                         struct ocfs2_cached_dealloc_ctxt *dealloc,
-                        enum ocfs2_extent_tree_type et_type);
+                        enum ocfs2_extent_tree_type et_type,
+                        void *private);
 int ocfs2_num_free_extents(struct ocfs2_super *osb,
                            struct inode *inode,
                            struct buffer_head *root_bh,
-                           enum ocfs2_extent_tree_type et_type);
+                           enum ocfs2_extent_tree_type et_type,
+                           void *private);
 
 /*
  * how many new metadata chunks would an allocation need at maximum?