Merge tag 'fix-missing-panels' into fixes

[linux.git] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7a993d7c022ea5c32c5d94c480ce280ac149e9f4..5f89c515f5bb72d6fb58388cb3f6b669a499e29b 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -584,10 +584,10 @@ struct gfs2_args {
        unsigned int ar_rgrplvb:1;              /* use lvbs for rgrp info */
        unsigned int ar_loccookie:1;            /* use location based readdir
                                                   cookies */
-       int ar_commit;                          /* Commit interval */
-       int ar_statfs_quantum;                  /* The fast statfs interval */
-       int ar_quota_quantum;                   /* The quota interval */
-       int ar_statfs_percent;                  /* The % change to force sync */
+       s32 ar_commit;                          /* Commit interval */
+       s32 ar_statfs_quantum;                  /* The fast statfs interval */
+       s32 ar_quota_quantum;                   /* The quota interval */
+       s32 ar_statfs_percent;                  /* The % change to force sync */
 };
 
 struct gfs2_tune {
@@ -725,6 +725,7 @@ struct gfs2_sbd {
        struct gfs2_glock *sd_freeze_gl;
        struct work_struct sd_freeze_work;
        wait_queue_head_t sd_glock_wait;
+       wait_queue_head_t sd_async_glock_wait;
        atomic_t sd_glock_disposal;
        struct completion sd_locking_init;
        struct completion sd_wdack;