diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /fs/ocfs2/dlmglue.h | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'fs/ocfs2/dlmglue.h')
| -rw-r--r-- | fs/ocfs2/dlmglue.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmglue.h b/fs/ocfs2/dlmglue.h index 8f2d1db2d9ea..243ae862ece5 100644 --- a/fs/ocfs2/dlmglue.h +++ b/fs/ocfs2/dlmglue.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef DLMGLUE_H | 27 | #ifndef DLMGLUE_H |
| 28 | #define DLMGLUE_H | 28 | #define DLMGLUE_H |
| 29 | 29 | ||
| 30 | #define OCFS2_LVB_VERSION 2 | 30 | #define OCFS2_LVB_VERSION 3 |
| 31 | 31 | ||
| 32 | struct ocfs2_meta_lvb { | 32 | struct ocfs2_meta_lvb { |
| 33 | __be32 lvb_version; | 33 | __be32 lvb_version; |
| @@ -40,7 +40,8 @@ struct ocfs2_meta_lvb { | |||
| 40 | __be64 lvb_isize; | 40 | __be64 lvb_isize; |
| 41 | __be16 lvb_imode; | 41 | __be16 lvb_imode; |
| 42 | __be16 lvb_inlink; | 42 | __be16 lvb_inlink; |
| 43 | __be32 lvb_reserved[3]; | 43 | __be32 lvb_iattr; |
| 44 | __be32 lvb_reserved[2]; | ||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | /* ocfs2_meta_lock_full() and ocfs2_data_lock_full() 'arg_flags' flags */ | 47 | /* ocfs2_meta_lock_full() and ocfs2_data_lock_full() 'arg_flags' flags */ |