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, 5 insertions, 4 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 7bb4fde7005..89d8541f85b 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -515,7 +515,7 @@ int ocfs2_add_inode_data(struct ocfs2_super *osb,
                                            clusters_to_add, mark_unwritten,
                                            fe_bh, el, handle,
                                            data_ac, meta_ac, reason_ret,
-                                           OCFS2_DINODE_EXTENT);
+                                           OCFS2_DINODE_EXTENT, NULL);
 }
 
 static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
@@ -565,7 +565,7 @@ restart_all:
              clusters_to_add);
         status = ocfs2_lock_allocators(inode, bh, &fe->id2.i_list,
                                        clusters_to_add, 0, &data_ac,
-                                       &meta_ac);
+                                       &meta_ac, OCFS2_DINODE_EXTENT, NULL);
         if (status) {
                 mlog_errno(status);
                 goto leave;
@@ -1237,7 +1237,8 @@ static int __ocfs2_remove_inode_range(struct inode *inode,
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
 
         ret = ocfs2_lock_allocators(inode, di_bh, &di->id2.i_list,
-                                    0, 1, NULL, &meta_ac);
+                                    0, 1, NULL, &meta_ac,
+                                    OCFS2_DINODE_EXTENT, NULL);
         if (ret) {
                 mlog_errno(ret);
                 return ret;
@@ -1268,7 +1269,7 @@ static int __ocfs2_remove_inode_range(struct inode *inode,
         }
 
         ret = ocfs2_remove_extent(inode, di_bh, cpos, len, handle, meta_ac,
-                                  dealloc, OCFS2_DINODE_EXTENT);
+                                  dealloc, OCFS2_DINODE_EXTENT, NULL);
         if (ret) {
                 mlog_errno(ret);
                 goto out_commit;