[Ocfs2-tools-devel] [PATCH 07/10] libocfs2: Remove unnecessary usage of insert_ctxt.

Tao Ma tao.ma at oracle.com
Wed Sep 30 07:27:44 PDT 2009


Some extent tree function use insert_ctxt which actually
has nothing to do with insert. So remove them.

Signed-off-by: Tao Ma <tao.ma at oracle.com>
---
 libocfs2/extent_tree.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libocfs2/extent_tree.c b/libocfs2/extent_tree.c
index 36f96df..2787f9a 100644
--- a/libocfs2/extent_tree.c
+++ b/libocfs2/extent_tree.c
@@ -2988,7 +2988,7 @@ static void ocfs2_split_record(ocfs2_filesys *fs,
  * in. left_path should only be passed in if we need to update that
  * portion of the tree after an edge insert.
  */
-static int ocfs2_insert_path(struct insert_ctxt* ctxt,
+static int ocfs2_insert_path(ocfs2_filesys *fs,
 			     struct ocfs2_path *left_path,
 			     struct ocfs2_path *right_path,
 			     struct ocfs2_extent_rec *insert_rec,
@@ -3002,10 +3002,10 @@ static int ocfs2_insert_path(struct insert_ctxt* ctxt,
 		 * of splits, but it's easier to just let one seperate
 		 * function sort it all out.
 		 */
-		ocfs2_split_record(ctxt->fs, left_path, right_path,
+		ocfs2_split_record(fs, left_path, right_path,
 				   insert_rec, insert->ins_split);
 	} else
-		ocfs2_insert_at_leaf(ctxt->fs, insert_rec, path_leaf_el(right_path),
+		ocfs2_insert_at_leaf(fs, insert_rec, path_leaf_el(right_path),
 				     insert);
 
 	if (left_path) {
@@ -3014,12 +3014,12 @@ static int ocfs2_insert_path(struct insert_ctxt* ctxt,
 		 * up portions of the tree after the insert.
 		 */
 		subtree_index = ocfs2_find_subtree_root(left_path, right_path);
-		ocfs2_complete_edge_insert(ctxt->fs, left_path,
+		ocfs2_complete_edge_insert(fs, left_path,
 				        right_path, subtree_index);
 	} else
 		subtree_index = 0;
 
-	ret = ocfs2_sync_path_to_disk(ctxt->fs, left_path,
+	ret = ocfs2_sync_path_to_disk(fs, left_path,
 				      right_path, subtree_index);
 	if (ret)
 		goto out;
@@ -3094,7 +3094,7 @@ static int ocfs2_do_insert_extent(struct insert_ctxt* ctxt,
 			goto out;
  	}
 
-	ret = ocfs2_insert_path(ctxt, left_path, right_path, insert_rec, type);
+	ret = ocfs2_insert_path(fs, left_path, right_path, insert_rec, type);
 	if (ret)
 		goto out;
 
-- 
1.5.5




More information about the Ocfs2-tools-devel mailing list