diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /fs/ocfs2/ocfs2_fs.h | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'fs/ocfs2/ocfs2_fs.h')
| -rw-r--r-- | fs/ocfs2/ocfs2_fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index dfb8a5bedfc8..c5b1ac547c15 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | 138 | ||
| 139 | /* Journal limits (in bytes) */ | 139 | /* Journal limits (in bytes) */ |
| 140 | #define OCFS2_MIN_JOURNAL_SIZE (4 * 1024 * 1024) | 140 | #define OCFS2_MIN_JOURNAL_SIZE (4 * 1024 * 1024) |
| 141 | #define OCFS2_MAX_JOURNAL_SIZE (500 * 1024 * 1024) | ||
| 142 | 141 | ||
| 143 | struct ocfs2_system_inode_info { | 142 | struct ocfs2_system_inode_info { |
| 144 | char *si_name; | 143 | char *si_name; |