diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 15:46:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 15:46:35 -0500 |
| commit | e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c (patch) | |
| tree | 5e8fbbcbb7516c8eca9c431b47c70c752823af39 /fs/ocfs2/ocfs2.h | |
| parent | bfa271d026fef5d8db9a95342c38eab6f7b287a2 (diff) | |
| parent | d24fbcda0c4988322949df3d759f1cfb32b32953 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Negotiate locking protocol versions.
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
| -rw-r--r-- | fs/ocfs2/ocfs2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index d08480580470..e8b7292e0152 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
| @@ -251,6 +251,7 @@ struct ocfs2_super | |||
| 251 | struct ocfs2_lock_res osb_rename_lockres; | 251 | struct ocfs2_lock_res osb_rename_lockres; |
| 252 | struct dlm_eviction_cb osb_eviction_cb; | 252 | struct dlm_eviction_cb osb_eviction_cb; |
| 253 | struct ocfs2_dlm_debug *osb_dlm_debug; | 253 | struct ocfs2_dlm_debug *osb_dlm_debug; |
| 254 | struct dlm_protocol_version osb_locking_proto; | ||
| 254 | 255 | ||
| 255 | struct dentry *osb_debug_root; | 256 | struct dentry *osb_debug_root; |
| 256 | 257 | ||