diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:24:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:25:03 -0400 |
| commit | bfefb7a0c6e08736f2d5917c468467f134bf28bb (patch) | |
| tree | 7aa7084114dc083fe5b4d7b532901bdeb67188e7 /fs/ext4/ext4_extents.h | |
| parent | 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ext4/ext4_extents.h')
| -rw-r--r-- | fs/ext4/ext4_extents.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h index 20a84105a10b..61652f1d15e6 100644 --- a/fs/ext4/ext4_extents.h +++ b/fs/ext4/ext4_extents.h | |||
| @@ -43,8 +43,7 @@ | |||
| 43 | #define CHECK_BINSEARCH__ | 43 | #define CHECK_BINSEARCH__ |
| 44 | 44 | ||
| 45 | /* | 45 | /* |
| 46 | * If EXT_DEBUG is defined you can use the 'extdebug' mount option | 46 | * Turn on EXT_DEBUG to get lots of info about extents operations. |
| 47 | * to get lots of info about what's going on. | ||
| 48 | */ | 47 | */ |
| 49 | #define EXT_DEBUG__ | 48 | #define EXT_DEBUG__ |
| 50 | #ifdef EXT_DEBUG | 49 | #ifdef EXT_DEBUG |
| @@ -138,6 +137,7 @@ typedef int (*ext_prepare_callback)(struct inode *, struct ext4_ext_path *, | |||
| 138 | #define EXT_BREAK 1 | 137 | #define EXT_BREAK 1 |
| 139 | #define EXT_REPEAT 2 | 138 | #define EXT_REPEAT 2 |
| 140 | 139 | ||
| 140 | /* Maximum logical block in a file; ext4_extent's ee_block is __le32 */ | ||
| 141 | #define EXT_MAX_BLOCK 0xffffffff | 141 | #define EXT_MAX_BLOCK 0xffffffff |
| 142 | 142 | ||
| 143 | /* | 143 | /* |