X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fgfs2%2Fincore.h;h=892ac37de8aed8e272e491354c62352df93e690e;hb=5f00bcb38ef9a980a33c6dbdc0044964b05f22dd;hp=81206e70cbf69485d19d27a7ae7515cc6b158586;hpb=94b0522ab77e4d74950e258e804ba05030b6fcff;p=~andy%2Flinux diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 81206e70cbf..892ac37de8a 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -163,7 +163,6 @@ struct gfs2_glock_operations { int (*go_dump)(struct seq_file *seq, const struct gfs2_glock *gl); void (*go_callback) (struct gfs2_glock *gl); const int go_type; - const unsigned long go_min_hold_time; const unsigned long go_flags; #define GLOF_ASPACE 1 }; @@ -221,6 +220,7 @@ struct gfs2_glock { unsigned int gl_hash; unsigned long gl_demote_time; /* time of first demote request */ + long gl_hold_time; struct list_head gl_holders; const struct gfs2_glock_operations *gl_ops; @@ -285,6 +285,7 @@ struct gfs2_inode { u64 i_goal; /* goal block for allocations */ struct rw_semaphore i_rw_mutex; struct list_head i_trunc_list; + __be64 *i_hash_cache; u32 i_entries; u32 i_diskflags; u8 i_height;