[PATCH] 64-bit jbd2 core

[linux-2.6-omap-h63xx.git] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index f50ea6282e7753dfd8b591a58fa8d4cbdc09c1dd..118dc693d1117d178883c3283c19ce9ad0faeb55 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -12,10 +12,6 @@
 
 #include <linux/fs.h>
 
-#define DIO_FORCE      0x00000001
-#define DIO_CLEAN      0x00000002
-#define DIO_DIRTY      0x00000004
-#define DIO_START      0x00000008
 #define DIO_WAIT       0x00000010
 #define DIO_METADATA   0x00000020
 #define DIO_DATA       0x00000040
@@ -152,7 +148,6 @@ struct gfs2_holder {
 };
 
 enum {
-       GLF_PLUG                = 0,
        GLF_LOCK                = 1,
        GLF_STICKY              = 2,
        GLF_PREFETCH            = 3,
@@ -162,10 +157,10 @@ enum {
 };
 
 struct gfs2_glock {
-       struct list_head gl_list;
+       struct hlist_node gl_list;
        unsigned long gl_flags;         /* GLF_... */
        struct lm_lockname gl_name;
-       struct kref gl_ref;
+       atomic_t gl_ref;
 
        spinlock_t gl_spin;
 
@@ -448,9 +443,6 @@ enum {
        SDF_NOATIME             = 3,
 };
 
-#define GFS2_GL_HASH_SHIFT     13
-#define GFS2_GL_HASH_SIZE      (1 << GFS2_GL_HASH_SHIFT)
-#define GFS2_GL_HASH_MASK      (GFS2_GL_HASH_SIZE - 1)
 #define GFS2_FSNAME_LEN                256
 
 struct gfs2_sbd {