X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Finterval_tree.h;h=1598119aba5b55c04a58296f0f6bd07a1962f630;hb=68fb53ad4bb2dbc2104d19613546ecf2534d97d5;hp=82ccea1ffbc3ffafba67e2dbfb4e7e9b1ffd3edc;hpb=10d07da8eeaa50d8b97751f99797705c73b211fb;p=fs%2Flustre-release.git diff --git a/lustre/include/interval_tree.h b/lustre/include/interval_tree.h index 82ccea1..1598119 100644 --- a/lustre/include/interval_tree.h +++ b/lustre/include/interval_tree.h @@ -15,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 */ @@ -40,7 +36,9 @@ #ifndef _INTERVAL_H__ #define _INTERVAL_H__ -#include /* LASSERT. */ +#include +#include +#include struct interval_node { struct interval_node *in_left; @@ -77,13 +75,15 @@ 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)