X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Finterval_tree.h;h=1598119aba5b55c04a58296f0f6bd07a1962f630;hb=4eca26ddab3186a68888862218fa8904f812e5a1;hp=b77b68cccbc2b9e8ad82d08263615e276a90704a;hpb=5cced5eb96914a5a51a551ed12e92ebfc7834029;p=fs%2Flustre-release.git

diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h
index b77b68c..1598119 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.
@@ -17,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -42,7 +36,9 @@
 #ifndef _INTERVAL_H__
 #define _INTERVAL_H__
 
-#include <libcfs/libcfs.h>   /* LASSERT. */
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
 
 struct interval_node {
         struct interval_node   *in_left;
@@ -79,15 +75,24 @@ static inline __u64 interval_high(struct interval_node *node)
         return node->in_extent.end;
 }
 
-static inline void interval_set(struct interval_node *node,
-                                __u64 start, __u64 end)
+static inline int interval_set(struct interval_node *node,
+			       __u64 start, __u64 end)
 {
-        LASSERT(start <= end);
-        node->in_extent.start = start;
-        node->in_extent.end = end;
-        node->in_max_high = end;
+	if (start > end)
+		return -ERANGE;
+	node->in_extent.start = start;
+	node->in_extent.end = end;
+	node->in_max_high = end;
+	return 0;
 }
 
+static inline void interval_init(struct interval_node *node)
+{
+	memset(node, 0, sizeof(*node));
+}
+
+int node_equal(struct interval_node *n1, struct interval_node *n2);
+
 /* Rules to write an interval callback.
  *  - the callback returns INTERVAL_ITER_STOP when it thinks the iteration
  *    should be stopped. It will then cause the iteration function to return
@@ -109,10 +114,6 @@ 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,