2 files changed, 7 insertions, 3 deletions

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 141573de7a9a..81868c0bc40e 100644
--- a/fs/ext3/super.c
+++ b/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/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 589b0b355d84..64134456ed8c 100644
--- a/include/linux/ext3_fs.h
+++ b/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