1 files changed, 9 insertions, 10 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 5c29216e9cc1..26aabd7caba7 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -31,7 +31,6 @@ struct gfs2_holder;
 struct gfs2_glock;
 struct gfs2_quota_data;
 struct gfs2_trans;
-struct gfs2_ail;
 struct gfs2_jdesc;
 struct gfs2_sbd;
 struct lm_lockops;
@@ -53,7 +52,7 @@ struct gfs2_log_header_host {
 
 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_after_commit) (struct gfs2_sbd *sdp, struct gfs2_trans *tr);
         void (*lo_before_scan) (struct gfs2_jdesc *jd,
                                 struct gfs2_log_header_host *head, int pass);
         int (*lo_scan_elements) (struct gfs2_jdesc *jd, unsigned int start,
@@ -139,7 +138,7 @@ struct gfs2_bufdata {
         struct list_head bd_list;
         const struct gfs2_log_operations *bd_ops;
 
-        struct gfs2_ail *bd_ail;
+        struct gfs2_trans *bd_tr;
         struct list_head bd_ail_st_list;
         struct list_head bd_ail_gl_list;
 };
@@ -211,7 +210,7 @@ struct gfs2_glock_operations {
         int (*go_lock) (struct gfs2_holder *gh);
         void (*go_unlock) (struct gfs2_holder *gh);
         int (*go_dump)(struct seq_file *seq, const struct gfs2_glock *gl);
-        void (*go_callback) (struct gfs2_glock *gl);
+        void (*go_callback)(struct gfs2_glock *gl, bool remote);
         const int go_type;
         const unsigned long go_flags;
 #define GLOF_ASPACE 1
@@ -433,6 +432,7 @@ struct gfs2_trans {
         struct gfs2_holder tr_t_gh;
 
         int tr_touched;
+        int tr_attached;
 
         unsigned int tr_num_buf_new;
         unsigned int tr_num_databuf_new;
@@ -440,14 +440,12 @@ struct gfs2_trans {
         unsigned int tr_num_databuf_rm;
         unsigned int tr_num_revoke;
         unsigned int tr_num_revoke_rm;
-};
 
-struct gfs2_ail {
-        struct list_head ai_list;
+        struct list_head tr_list;
 
-        unsigned int ai_first;
-        struct list_head ai_ail1_list;
-        struct list_head ai_ail2_list;
+        unsigned int tr_first;
+        struct list_head tr_ail1_list;
+        struct list_head tr_ail2_list;
 };
 
 struct gfs2_journal_extent {
@@ -710,6 +708,7 @@ struct gfs2_sbd {
 
         spinlock_t sd_log_lock;
 
+        struct gfs2_trans *sd_log_tr;
         unsigned int sd_log_blks_reserved;
         unsigned int sd_log_commited_buf;
         unsigned int sd_log_commited_databuf;