From 76e833f909695b1ac39340cacf0d985f64147328 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 9 Sep 2003 08:08:34 +0000 Subject: [PATCH] merge b_llp_hp into b_flock, in preparation for integration. - also renames new l_data field to l_policy_data, to reduce the risk of catastrophic bugs -- l_data means something _totally different_ in every other branch (namely, l_ast_data in this branch) --- lustre/include/linux/lustre_otree.h | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 lustre/include/linux/lustre_otree.h diff --git a/lustre/include/linux/lustre_otree.h b/lustre/include/linux/lustre_otree.h deleted file mode 100644 index 3d8d510..0000000 --- a/lustre/include/linux/lustre_otree.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - */ -#ifndef _LUSTRE_OTREE_H -#define _LUSTRE_OTREE_H - -/* XXX ok, I can't make sense of our header nest right now.. */ -#ifdef __KERNEL__ -#include -#include - -struct otree { - rb_root_t ot_root; - spinlock_t ot_lock; - unsigned long ot_num_marked; -}; -#else -struct otree { - unsigned long lalala; -}; -#endif - -int ot_mark_offset(struct otree *ot, unsigned long offset); -int ot_clear_extent(struct otree *ot, unsigned long start, unsigned long end); -int ot_find_marked_extent(struct otree *ot, unsigned long *start, - unsigned long *end); -int ot_last_marked(struct otree *ot, unsigned long *last); -unsigned long ot_num_marked(struct otree *ot); -void ot_init(struct otree *ot); - -#endif -- 1.8.3.1