X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Finterval_tree.h;h=22581e37900ef02fd46def8be87940196e669e52;hb=73e0d8cff3ff7fc6cd57badab434f9511b125704;hp=5958790366572c204e2ee0245e85bb75c3b66046;hpb=6ded7c96c486ebcb069e9125d4fe94c1efddbf60;p=fs%2Flustre-release.git

diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h
index 5958790..22581e3 100644
--- a/lustre/include/interval_tree.h
+++ b/lustre/include/interval_tree.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -92,7 +90,7 @@ static inline void interval_set(struct interval_node *node,
  *  - the callback returns INTERVAL_ITER_STOP when it thinks the iteration
  *    should be stopped. It will then cause the iteration function to return
  *    immediately with return value INTERVAL_ITER_STOP.
- *  - callbacks for interval_iterate and interval_iterate_reverse: Every
+ *  - callbacks for interval_iterate and interval_iterate_reverse: Every 
  *    nodes in the tree will be set to @node before the callback being called
  *  - callback for interval_search: Only overlapped node will be set to @node
  *    before the callback being called.
@@ -109,21 +107,17 @@ void interval_erase(struct interval_node *node, struct interval_node **root);
 enum interval_iter interval_search(struct interval_node *root,
                                    struct interval_node_extent *ex,
                                    interval_callback_t func, void *data);
-enum interval_iter interval_search_expand_extent(struct interval_node *root,
-                                   struct interval_node_extent *ex,
-                                   struct interval_node_extent *result_ext,
-                                   interval_callback_t func, void *data);
 
 /* Iterate every node in the tree - by reverse order or regular order. */
-enum interval_iter interval_iterate(struct interval_node *root,
+enum interval_iter interval_iterate(struct interval_node *root, 
                                     interval_callback_t func, void *data);
 enum interval_iter interval_iterate_reverse(struct interval_node *root,
                                     interval_callback_t func,void *data);
 
-void interval_expand(struct interval_node *root,
+void interval_expand(struct interval_node *root, 
                      struct interval_node_extent *ext,
                      struct interval_node_extent *limiter);
-int interval_is_overlapped(struct interval_node *root,
+int interval_is_overlapped(struct interval_node *root, 
                            struct interval_node_extent *ex);
 struct interval_node *interval_find(struct interval_node *root,
                                     struct interval_node_extent *ex);