Pull percpu-dtc into release branch

[linux-2.6] / fs / gfs2 / glock.h

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index ddc56dc4ec9fe59d4902d323e8458d253edb7073..f50e40ceca432c721d429eaa20ddf4bd7c29b4e5 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -20,7 +20,6 @@
 #define LM_FLAG_ANY            0x00000008
 #define LM_FLAG_PRIORITY       0x00000010 */
 
-#define GL_LOCAL_EXCL          0x00000020
 #define GL_ASYNC               0x00000040
 #define GL_EXACT               0x00000080
 #define GL_SKIP                        0x00000100
@@ -83,10 +82,6 @@ void gfs2_holder_init(struct gfs2_glock *gl, unsigned int state, unsigned flags,
 void gfs2_holder_reinit(unsigned int state, unsigned flags,
                        struct gfs2_holder *gh);
 void gfs2_holder_uninit(struct gfs2_holder *gh);
-
-void gfs2_glock_xmote_th(struct gfs2_glock *gl, unsigned int state, int flags);
-void gfs2_glock_drop_th(struct gfs2_glock *gl);
-
 int gfs2_glock_nq(struct gfs2_holder *gh);
 int gfs2_glock_poll(struct gfs2_holder *gh);
 int gfs2_glock_wait(struct gfs2_holder *gh);