diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:22 -0400 |
| commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
| tree | 55084d3d51708f90f27d0a70db5ab63916942f14 /fs/ext4/super.c | |
| parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9987bba99db3..2958f4e6f222 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -2508,6 +2508,15 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
| 2508 | if (EXT4_BLOCKS_PER_GROUP(sb) == 0) | 2508 | if (EXT4_BLOCKS_PER_GROUP(sb) == 0) |
| 2509 | goto cantfind_ext4; | 2509 | goto cantfind_ext4; |
| 2510 | 2510 | ||
| 2511 | /* check blocks count against device size */ | ||
| 2512 | blocks_count = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits; | ||
| 2513 | if (blocks_count && ext4_blocks_count(es) > blocks_count) { | ||
| 2514 | printk(KERN_WARNING "EXT4-fs: bad geometry: block count %llu " | ||
| 2515 | "exceeds size of device (%llu blocks)\n", | ||
| 2516 | ext4_blocks_count(es), blocks_count); | ||
| 2517 | goto failed_mount; | ||
| 2518 | } | ||
| 2519 | |||
| 2511 | /* | 2520 | /* |
| 2512 | * It makes no sense for the first data block to be beyond the end | 2521 | * It makes no sense for the first data block to be beyond the end |
| 2513 | * of the filesystem. | 2522 | * of the filesystem. |