Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux.git] / fs / ocfs2 / ocfs2.h

diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index a4647a646f078fa877fe5a295518ef0082e78a8d..fddbbd60f4343f845a1cd0bf516eb84e1f09ada8 100644 (file)
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -150,6 +150,7 @@ struct ocfs2_lock_stats {
 
        /* Storing max wait in usecs saves 24 bytes per inode */
        u32             ls_max;         /* Max wait in USEC */
+       u64             ls_last;        /* Last unlock time in USEC */
 };
 #endif
 
@@ -191,6 +192,7 @@ struct ocfs2_lock_res {
 #ifdef CONFIG_OCFS2_FS_STATS
        struct ocfs2_lock_stats  l_lock_prmode;         /* PR mode stats */
        u32                      l_lock_refresh;        /* Disk refreshes */
+       u64                      l_lock_wait;   /* First lock wait time */
        struct ocfs2_lock_stats  l_lock_exmode;         /* EX mode stats */
 #endif
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
@@ -222,6 +224,8 @@ struct ocfs2_orphan_scan {
 struct ocfs2_dlm_debug {
        struct kref d_refcnt;
        struct dentry *d_locking_state;
+       struct dentry *d_locking_filter;
+       u32 d_filter_secs;
        struct list_head d_lockres_tracking;
 };