diff options
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
-rw-r--r-- | fs/ocfs2/ocfs2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index 31dc28b48392..af929eca5412 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
@@ -98,6 +98,9 @@ enum ocfs2_unlock_action { | |||
98 | * dropped. */ | 98 | * dropped. */ |
99 | #define OCFS2_LOCK_QUEUED (0x00000100) /* queued for downconvert */ | 99 | #define OCFS2_LOCK_QUEUED (0x00000100) /* queued for downconvert */ |
100 | #define OCFS2_LOCK_NOCACHE (0x00000200) /* don't use a holder count */ | 100 | #define OCFS2_LOCK_NOCACHE (0x00000200) /* don't use a holder count */ |
101 | #define OCFS2_LOCK_PENDING (0x00000400) /* This lockres is pending a | ||
102 | call to dlm_lock. Only | ||
103 | exists with BUSY set. */ | ||
101 | 104 | ||
102 | struct ocfs2_lock_res_ops; | 105 | struct ocfs2_lock_res_ops; |
103 | 106 | ||
@@ -124,6 +127,7 @@ struct ocfs2_lock_res { | |||
124 | enum ocfs2_unlock_action l_unlock_action; | 127 | enum ocfs2_unlock_action l_unlock_action; |
125 | int l_requested; | 128 | int l_requested; |
126 | int l_blocking; | 129 | int l_blocking; |
130 | unsigned int l_pending_gen; | ||
127 | 131 | ||
128 | wait_queue_head_t l_event; | 132 | wait_queue_head_t l_event; |
129 | 133 | ||