[GFS2] split and annotate gfs2_log_head

[safe/jmp/linux-2.6] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 1fed8d1..e69f339 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
@@ -45,7 +41,7 @@ struct gfs2_log_operations {
        void (*lo_before_commit) (struct gfs2_sbd *sdp);
        void (*lo_after_commit) (struct gfs2_sbd *sdp, struct gfs2_ail *ai);
        void (*lo_before_scan) (struct gfs2_jdesc *jd,
-                               struct gfs2_log_header *head, int pass);
+                               struct gfs2_log_header_host *head, int pass);
        int (*lo_scan_elements) (struct gfs2_jdesc *jd, unsigned int start,
                                 struct gfs2_log_descriptor *ld, __be64 *ptr,
                                 int pass);
@@ -72,7 +68,7 @@ struct gfs2_rgrpd {
        struct list_head rd_recent;     /* Recently used rgrps */
        struct gfs2_glock *rd_gl;       /* Glock for this rgrp */
        struct gfs2_rindex rd_ri;
-       struct gfs2_rgrp rd_rg;
+       struct gfs2_rgrp_host rd_rg;
        u64 rd_rg_vn;
        struct gfs2_bitmap *rd_bits;
        unsigned int rd_bh_count;
@@ -161,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;
 
@@ -233,7 +229,7 @@ struct gfs2_inode {
        unsigned long i_flags;          /* GIF_... */
 
        u64 i_vn;
-       struct gfs2_dinode i_di; /* To be replaced by ref to block */
+       struct gfs2_dinode_host i_di; /* To be replaced by ref to block */
 
        struct gfs2_glock *i_gl; /* Move into i_gh? */
        struct gfs2_holder i_iopen_gh;
@@ -454,7 +450,7 @@ struct gfs2_sbd {
        struct super_block *sd_vfs_meta;
        struct kobject sd_kobj;
        unsigned long sd_flags; /* SDF_... */
-       struct gfs2_sb sd_sb;
+       struct gfs2_sb_host sd_sb;
 
        /* Constants computed on mount */