Add changes from the Linux-2.6 tree.

[linux-2.6.git] / fs / xfs / xfs_behavior.h

diff --git a/fs/xfs/xfs_behavior.h b/fs/xfs/xfs_behavior.h
index 1d8ff10..e7ca1fe 100644 (file)
--- a/fs/xfs/xfs_behavior.h
+++ b/fs/xfs/xfs_behavior.h
@@ -78,15 +78,12 @@
  *
  */
 
-struct bhv_head_lock;
-
 /*
  * Behavior head.  Head of the chain of behaviors.
  * Contained within each virtualized object data structure.
  */
 typedef struct bhv_head {
        struct bhv_desc *bh_first;      /* first behavior in chain */
-       struct bhv_head_lock *bh_lockp; /* pointer to lock info struct */
 } bhv_head_t;
 
 /*
@@ -179,12 +176,10 @@ extern void bhv_insert_initial(bhv_head_t *, bhv_desc_t *);
  * Behavior module prototypes.
  */
 extern void            bhv_remove_not_first(bhv_head_t *bhp, bhv_desc_t *bdp);
-extern bhv_desc_t *    bhv_lookup(bhv_head_t *bhp, void *ops);
 extern bhv_desc_t *    bhv_lookup_range(bhv_head_t *bhp, int low, int high);
 extern bhv_desc_t *    bhv_base(bhv_head_t *bhp);
 
 /* No bhv locking on Linux */
-#define bhv_lookup_unlocked    bhv_lookup
 #define bhv_base_unlocked      bhv_base
 
 #endif /* __XFS_BEHAVIOR_H__ */