[PATCH] Fix core files so they make sense to gdb...

[powerpc.git] / fs / gfs2 / glock.h

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index fdf58db..2b2a889 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -4,12 +4,14 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #ifndef __GLOCK_DOT_H__
 #define __GLOCK_DOT_H__
 
+#include "incore.h"
+
 /* Flags for lock requests; used in gfs2_holder gh_flag field.
    From lm_interface.h:
 #define LM_FLAG_TRY            0x00000001
@@ -24,7 +26,6 @@
 #define GL_SKIP                        0x00000100
 #define GL_ATIME               0x00000200
 #define GL_NOCACHE             0x00000400
-#define GL_SYNC                        0x00000800
 #define GL_NOCANCEL            0x00001000
 #define GL_AOP                 0x00004000
 #define GL_DUMP                        0x00008000
@@ -52,17 +53,17 @@ static inline int gfs2_glock_is_locked_by_me(struct gfs2_glock *gl)
 
 static inline int gfs2_glock_is_held_excl(struct gfs2_glock *gl)
 {
-       return (gl->gl_state == LM_ST_EXCLUSIVE);
+       return gl->gl_state == LM_ST_EXCLUSIVE;
 }
 
 static inline int gfs2_glock_is_held_dfrd(struct gfs2_glock *gl)
 {
-       return (gl->gl_state == LM_ST_DEFERRED);
+       return gl->gl_state == LM_ST_DEFERRED;
 }
 
 static inline int gfs2_glock_is_held_shrd(struct gfs2_glock *gl)
 {
-       return (gl->gl_state == LM_ST_SHARED);
+       return gl->gl_state == LM_ST_SHARED;
 }
 
 static inline int gfs2_glock_is_blocking(struct gfs2_glock *gl)
@@ -75,7 +76,7 @@ static inline int gfs2_glock_is_blocking(struct gfs2_glock *gl)
 }
 
 int gfs2_glock_get(struct gfs2_sbd *sdp,
-                  uint64_t number, struct gfs2_glock_operations *glops,
+                  u64 number, const struct gfs2_glock_operations *glops,
                   int create, struct gfs2_glock **glp);
 void gfs2_glock_hold(struct gfs2_glock *gl);
 int gfs2_glock_put(struct gfs2_glock *gl);
@@ -97,15 +98,15 @@ int gfs2_glock_be_greedy(struct gfs2_glock *gl, unsigned int time);
 
 void gfs2_glock_dq_uninit(struct gfs2_holder *gh);
 int gfs2_glock_nq_num(struct gfs2_sbd *sdp,
-                     uint64_t number, struct gfs2_glock_operations *glops,
+                     u64 number, const struct gfs2_glock_operations *glops,
                      unsigned int state, int flags, struct gfs2_holder *gh);
 
 int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs);
 void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs);
 void gfs2_glock_dq_uninit_m(unsigned int num_gh, struct gfs2_holder *ghs);
 
-void gfs2_glock_prefetch_num(struct gfs2_sbd *sdp, uint64_t number,
-                            struct gfs2_glock_operations *glops,
+void gfs2_glock_prefetch_num(struct gfs2_sbd *sdp, u64 number,
+                            const struct gfs2_glock_operations *glops,
                             unsigned int state, int flags);
 void gfs2_glock_inode_squish(struct inode *inode);
 
@@ -139,9 +140,7 @@ static inline int gfs2_glock_nq_init(struct gfs2_glock *gl,
 int gfs2_lvb_hold(struct gfs2_glock *gl);
 void gfs2_lvb_unhold(struct gfs2_glock *gl);
 
-void gfs2_glock_cb(lm_fsdata_t *fsdata, unsigned int type, void *data);
-
-void gfs2_iopen_go_callback(struct gfs2_glock *gl, unsigned int state);
+void gfs2_glock_cb(void *cb_data, unsigned int type, void *data);
 
 void gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl);
 void gfs2_reclaim_glock(struct gfs2_sbd *sdp);
@@ -149,4 +148,6 @@ void gfs2_reclaim_glock(struct gfs2_sbd *sdp);
 void gfs2_scand_internal(struct gfs2_sbd *sdp);
 void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait);
 
+int __init gfs2_glock_init(void);
+
 #endif /* __GLOCK_DOT_H__ */