From 73becb1ae026a337c9cd6573fe43fbe925dc4ef0 Mon Sep 17 00:00:00 2001 From: Takashi Sato Date: Thu, 18 Oct 2007 03:06:56 -0700 Subject: [PATCH] --- yaml --- r: 71217 b: refs/heads/master c: 0f0a89ebe1ccf7c280534f69577cdd182941eb6a h: refs/heads/master i: 71215: ff69bc8f1045b0cbc54657acce415bf3ede97b21 v: v3 --- [refs] | 2 +- trunk/fs/ext3/super.c | 6 +++++- trunk/include/linux/ext3_fs.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6ac7d018b91f..467b0e9fd57b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4176ed593866b5e4bcf86896e0734315ad46661b +refs/heads/master: 0f0a89ebe1ccf7c280534f69577cdd182941eb6a diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index 141573de7a9a..81868c0bc40e 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -1620,7 +1620,11 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) } brelse (bh); - sb_set_blocksize(sb, blocksize); + if (!sb_set_blocksize(sb, blocksize)) { + printk(KERN_ERR "EXT3-fs: bad blocksize %d.\n", + blocksize); + goto out_fail; + } logic_sb_block = (sb_block * EXT3_MIN_BLOCK_SIZE) / blocksize; offset = (sb_block * EXT3_MIN_BLOCK_SIZE) % blocksize; bh = sb_bread(sb, logic_sb_block); diff --git a/trunk/include/linux/ext3_fs.h b/trunk/include/linux/ext3_fs.h index 589b0b355d84..64134456ed8c 100644 --- a/trunk/include/linux/ext3_fs.h +++ b/trunk/include/linux/ext3_fs.h @@ -72,8 +72,8 @@ * Macro-instructions used to manage several block sizes */ #define EXT3_MIN_BLOCK_SIZE 1024 -#define EXT3_MAX_BLOCK_SIZE 4096 -#define EXT3_MIN_BLOCK_LOG_SIZE 10 +#define EXT3_MAX_BLOCK_SIZE 65536 +#define EXT3_MIN_BLOCK_LOG_SIZE 10 #ifdef __KERNEL__ # define EXT3_BLOCK_SIZE(s) ((s)->s_blocksize) #else