Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0a89eb authored by Takashi Sato's avatar Takashi Sato Committed by Linus Torvalds
Browse files

ext3: support large blocksize up to PAGESIZE 



This patch set supports large block size(>4k, <=64k) in ext3 just enlarging
the block size limit.  But it is NOT possible to have 64kB blocksize on
ext3 without some changes to the directory handling code.  The reason is
that an empty 64kB directory block would have a rec_len == (__u16)2^16 ==
0, and this would cause an error to be hit in the filesystem.  The proposed
solution is treat 64k rec_len with a an impossible value like rec_len =
0xffff to handle this.

The Patch-set consists of the following 2 patches.
  [1/2]  ext3: enlarge blocksize
         - Allow blocksize up to pagesize

  [2/2]  ext3: fix rec_len overflow
         - prevent rec_len from overflow with 64KB blocksize

Now on 64k page ppc64 box runs with this patch set we could create a 64k
block size ext3, and able to handle empty directory block.

Signed-off-by: default avatarTakashi Sato <sho@tnes.nec.co.jp>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Acked-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4176ed59

fs/ext3/super.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/ext3_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
 * Macro-instructions used to manage several block sizes

 */

#define EXT3_MIN_BLOCK_SIZE		1024

#define	EXT3_MAX_BLOCK_SIZE		4096

#define	EXT3_MAX_BLOCK_SIZE		65536

#define EXT3_MIN_BLOCK_LOG_SIZE		10

#ifdef __KERNEL__

# define EXT3_BLOCK_SIZE(s)		((s)->s_blocksize)