aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/incore.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/incore.h')
-rw-r--r--fs/gfs2/incore.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 1390b30daf19..23b611aa70d2 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -11,6 +11,7 @@
11#define __INCORE_DOT_H__ 11#define __INCORE_DOT_H__
12 12
13#include <linux/fs.h> 13#include <linux/fs.h>
14#include <linux/workqueue.h>
14 15
15#define DIO_WAIT 0x00000010 16#define DIO_WAIT 0x00000010
16#define DIO_METADATA 0x00000020 17#define DIO_METADATA 0x00000020
@@ -130,6 +131,7 @@ struct gfs2_glock_operations {
130 int (*go_lock) (struct gfs2_holder *gh); 131 int (*go_lock) (struct gfs2_holder *gh);
131 void (*go_unlock) (struct gfs2_holder *gh); 132 void (*go_unlock) (struct gfs2_holder *gh);
132 const int go_type; 133 const int go_type;
134 const unsigned long go_min_hold_time;
133}; 135};
134 136
135enum { 137enum {
@@ -161,6 +163,7 @@ enum {
161 GLF_LOCK = 1, 163 GLF_LOCK = 1,
162 GLF_STICKY = 2, 164 GLF_STICKY = 2,
163 GLF_DEMOTE = 3, 165 GLF_DEMOTE = 3,
166 GLF_PENDING_DEMOTE = 4,
164 GLF_DIRTY = 5, 167 GLF_DIRTY = 5,
165}; 168};
166 169
@@ -193,6 +196,7 @@ struct gfs2_glock {
193 196
194 u64 gl_vn; 197 u64 gl_vn;
195 unsigned long gl_stamp; 198 unsigned long gl_stamp;
199 unsigned long gl_tchange;
196 void *gl_object; 200 void *gl_object;
197 201
198 struct list_head gl_reclaim; 202 struct list_head gl_reclaim;
@@ -203,6 +207,7 @@ struct gfs2_glock {
203 struct gfs2_log_element gl_le; 207 struct gfs2_log_element gl_le;
204 struct list_head gl_ail_list; 208 struct list_head gl_ail_list;
205 atomic_t gl_ail_count; 209 atomic_t gl_ail_count;
210 struct delayed_work gl_work;
206}; 211};
207 212
208struct gfs2_alloc { 213struct gfs2_alloc {