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.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index a24c4af09ce0..dc024b18ea96 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -111,7 +111,6 @@ struct gfs2_glock_operations {
111 int (*go_lock) (struct gfs2_holder *gh); 111 int (*go_lock) (struct gfs2_holder *gh);
112 void (*go_unlock) (struct gfs2_holder *gh); 112 void (*go_unlock) (struct gfs2_holder *gh);
113 void (*go_callback) (struct gfs2_glock *gl, unsigned int state); 113 void (*go_callback) (struct gfs2_glock *gl, unsigned int state);
114 void (*go_greedy) (struct gfs2_glock *gl);
115 const int go_type; 114 const int go_type;
116}; 115};
117 116
@@ -120,7 +119,6 @@ enum {
120 HIF_MUTEX = 0, 119 HIF_MUTEX = 0,
121 HIF_PROMOTE = 1, 120 HIF_PROMOTE = 1,
122 HIF_DEMOTE = 2, 121 HIF_DEMOTE = 2,
123 HIF_GREEDY = 3,
124 122
125 /* States */ 123 /* States */
126 HIF_ALLOCED = 4, 124 HIF_ALLOCED = 4,
@@ -149,7 +147,6 @@ enum {
149 GLF_STICKY = 2, 147 GLF_STICKY = 2,
150 GLF_DIRTY = 5, 148 GLF_DIRTY = 5,
151 GLF_SKIP_WAITERS2 = 6, 149 GLF_SKIP_WAITERS2 = 6,
152 GLF_GREEDY = 7,
153}; 150};
154 151
155struct gfs2_glock { 152struct gfs2_glock {
@@ -166,7 +163,7 @@ struct gfs2_glock {
166 unsigned long gl_ip; 163 unsigned long gl_ip;
167 struct list_head gl_holders; 164 struct list_head gl_holders;
168 struct list_head gl_waiters1; /* HIF_MUTEX */ 165 struct list_head gl_waiters1; /* HIF_MUTEX */
169 struct list_head gl_waiters2; /* HIF_DEMOTE, HIF_GREEDY */ 166 struct list_head gl_waiters2; /* HIF_DEMOTE */
170 struct list_head gl_waiters3; /* HIF_PROMOTE */ 167 struct list_head gl_waiters3; /* HIF_PROMOTE */
171 168
172 const struct gfs2_glock_operations *gl_ops; 169 const struct gfs2_glock_operations *gl_ops;
@@ -235,7 +232,6 @@ struct gfs2_inode {
235 232
236 spinlock_t i_spin; 233 spinlock_t i_spin;
237 struct rw_semaphore i_rw_mutex; 234 struct rw_semaphore i_rw_mutex;
238 unsigned int i_greedy;
239 unsigned long i_last_pfault; 235 unsigned long i_last_pfault;
240 236
241 struct buffer_head *i_cache[GFS2_MAX_META_HEIGHT]; 237 struct buffer_head *i_cache[GFS2_MAX_META_HEIGHT];
@@ -423,9 +419,6 @@ struct gfs2_tune {
423 unsigned int gt_complain_secs; 419 unsigned int gt_complain_secs;
424 unsigned int gt_reclaim_limit; /* Max num of glocks in reclaim list */ 420 unsigned int gt_reclaim_limit; /* Max num of glocks in reclaim list */
425 unsigned int gt_entries_per_readdir; 421 unsigned int gt_entries_per_readdir;
426 unsigned int gt_greedy_default;
427 unsigned int gt_greedy_quantum;
428 unsigned int gt_greedy_max;
429 unsigned int gt_statfs_quantum; 422 unsigned int gt_statfs_quantum;
430 unsigned int gt_statfs_slow; 423 unsigned int gt_statfs_slow;
431}; 424};