Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index bdf70c18610cfafd26d8d475e7ea939d54487a44..67d310c9ada3222ef1c08333397f65a29d1e454a 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -465,9 +465,7 @@ struct gfs2_trans {
        unsigned int tr_reserved;
        unsigned int tr_touched:1;
        unsigned int tr_attached:1;
-
-       struct gfs2_holder tr_t_gh;
-
+       unsigned int tr_alloced:1;
 
        unsigned int tr_num_buf_new;
        unsigned int tr_num_databuf_new;
@@ -682,7 +680,7 @@ struct gfs2_sbd {
        struct lm_lockstruct sd_lockstruct;
        struct gfs2_holder sd_live_gh;
        struct gfs2_glock *sd_rename_gl;
-       struct gfs2_glock *sd_trans_gl;
+       struct gfs2_glock *sd_freeze_gl;
        wait_queue_head_t sd_glock_wait;
        atomic_t sd_glock_disposal;
        struct completion sd_locking_init;
@@ -730,6 +728,8 @@ struct gfs2_sbd {
        struct gfs2_holder sd_sc_gh;
        struct gfs2_holder sd_qc_gh;
 
+       struct completion sd_journal_ready;
+
        /* Daemon stuff */
 
        struct task_struct *sd_logd_process;
@@ -794,6 +794,12 @@ struct gfs2_sbd {
 
        /* For quiescing the filesystem */
        struct gfs2_holder sd_freeze_gh;
+       struct gfs2_holder sd_freeze_root_gh;
+       struct gfs2_holder sd_thaw_gh;
+       atomic_t sd_log_freeze;
+       atomic_t sd_frozen_root;
+       wait_queue_head_t sd_frozen_root_wait;
+       wait_queue_head_t sd_log_frozen_wait;
 
        char sd_fsname[GFS2_FSNAME_LEN];
        char sd_table_name[GFS2_FSNAME_LEN];