ocfs2: Abstract ocfs2_extent_tree in b-tree operations.

In the old extent tree operation, we take the hypothesis that we
are using the ocfs2_extent_list in ocfs2_dinode as the tree root.
As xattr will also use ocfs2_extent_list to store large value
for a xattr entry, we refactor the tree operation so that xattr
can use it directly.

The refactoring includes 4 steps:
1. Abstract set/get of last_eb_blk and update_clusters since they may
   be stored in different location for dinode and xattr.
2. Add a new structure named ocfs2_extent_tree to indicate the
   extent tree the operation will work on.
3. Remove all the use of fe_bh and di, use root_bh and root_el in
   extent tree instead. So now all the fe_bh is replaced with
   et->root_bh, el with root_el accordingly.
4. Make ocfs2_lock_allocators generic. Now it is limited to be only used
   in file extend allocation. But the whole function is useful when we want
   to store large EAs.

Note: This patch doesn't touch ocfs2_commit_truncate() since it is not used
for anything other than truncate inode data btrees.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 126aa219c0c1..ba0fb9e16264 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -1306,7 +1306,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
          * related blocks have been journaled already.
          */
         ret = ocfs2_insert_extent(osb, handle, dir, di_bh, 0, blkno, len, 0,
-                                  NULL);
+                                  NULL, OCFS2_DINODE_EXTENT);
         if (ret) {
                 mlog_errno(ret);
                 goto out_commit;
@@ -1338,7 +1338,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
                 blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off);
 
                 ret = ocfs2_insert_extent(osb, handle, dir, di_bh, 1, blkno,
-                                          len, 0, NULL);
+                                          len, 0, NULL, OCFS2_DINODE_EXTENT);
                 if (ret) {
                         mlog_errno(ret);
                         goto out_commit;
@@ -1481,7 +1481,8 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
         if (dir_i_size == ocfs2_clusters_to_bytes(sb, OCFS2_I(dir)->ip_clusters)) {
                 spin_unlock(&OCFS2_I(dir)->ip_lock);
                 num_free_extents = ocfs2_num_free_extents(osb, dir,
-                                                          parent_fe_bh);
+                                                          parent_fe_bh,
+                                                          OCFS2_DINODE_EXTENT);
                 if (num_free_extents < 0) {
                         status = num_free_extents;
                         mlog_errno(status);