Messages in this thread Patch in this message | | | Subject | [RFC][11/21]ext3 enlarge file size | From | sho@tnes ... | Date | Thu, 13 Apr 2006 16:08:31 +0900 |
| |
Summary of this patch: [11/21] enlarge file size(ext3) - If the flag is set to super block, i_blocks of disk inode (ext3_inode) is filesystem-block unit, and i_blocks of VFS inode is sector unit.
- If the flag is set to super block, max file size is set to (FS blocksize) * (2^32 -1).
Signed-off-by: Takashi Sato sho@tnes.nec.co.jp --- diff -upNr -X linux-2.6.17-rc1/Documentation/dontdiff linux-2.6.17-rc1.tmp/fs/ext3/inode.c linux-2.6.17-rc1.tmp2/fs/ext3/inode.c --- linux-2.6.17-rc1.tmp/fs/ext3/inode.c 2006-04-07 08:53:35.000000000 +0900 +++ linux-2.6.17-rc1.tmp2/fs/ext3/inode.c 2006-04-07 09:02:09.000000000 +0900 @@ -2578,6 +2578,7 @@ void ext3_read_inode(struct inode * inod struct ext3_inode *raw_inode; struct ext3_inode_info *ei = EXT3_I(inode); struct buffer_head *bh; + struct super_block *sb = inode->i_sb; int block; #ifdef CONFIG_EXT3_FS_POSIX_ACL @@ -2627,7 +2628,13 @@ void ext3_read_inode(struct inode * inod inode->i_blksize = PAGE_SIZE; /* This is the optimal IO size * (for stat), not the fs block * size */ - inode->i_blocks = le32_to_cpu(raw_inode->i_blocks); + if (EXT3_HAS_INCOMPAT_FEATURE(sb, + EXT3_FEATURE_INCOMPAT_LARGE_BLOCK)) { + inode->i_blocks = (blkcnt_t)le32_to_cpu(raw_inode->i_blocks) + << (inode->i_blkbits - EXT3_SECTOR_BITS); + } else { + inode->i_blocks = le32_to_cpu(raw_inode->i_blocks); + } ei->i_flags = le32_to_cpu(raw_inode->i_flags); #ifdef EXT3_FRAGMENTS ei->i_faddr = le32_to_cpu(raw_inode->i_faddr); @@ -2723,6 +2730,7 @@ static int ext3_do_update_inode(handle_t struct ext3_inode *raw_inode = ext3_raw_inode(iloc); struct ext3_inode_info *ei = EXT3_I(inode); struct buffer_head *bh = iloc->bh; + struct super_block *sb = inode->i_sb; int err = 0, rc, block; /* For fields not not tracking in the in-memory inode, @@ -2760,7 +2768,13 @@ static int ext3_do_update_inode(handle_t raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); raw_inode->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec); raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec); - raw_inode->i_blocks = cpu_to_le32(inode->i_blocks); + if (EXT3_HAS_INCOMPAT_FEATURE(sb, + EXT3_FEATURE_INCOMPAT_LARGE_BLOCK)) { + raw_inode->i_blocks = cpu_to_le32((inode->i_blocks) + >> (inode->i_blkbits - EXT3_SECTOR_BITS)); + } else { + raw_inode->i_blocks = cpu_to_le32(inode->i_blocks); + } raw_inode->i_dtime = cpu_to_le32(ei->i_dtime); raw_inode->i_flags = cpu_to_le32(ei->i_flags); #ifdef EXT3_FRAGMENTS diff -upNr -X linux-2.6.17-rc1/Documentation/dontdiff linux-2.6.17-rc1.tmp/fs/ext3/super.c linux-2.6.17-rc1.tmp2/fs/ext3/super.c --- linux-2.6.17-rc1.tmp/fs/ext3/super.c 2006-04-07 08:56:16.000000000 +0900 +++ linux-2.6.17-rc1.tmp2/fs/ext3/super.c 2006-04-07 09:02:09.000000000 +0900 @@ -1297,14 +1297,20 @@ static void ext3_orphan_cleanup (struct * block limit, and also a limit of (2^32 - 1) 512-byte sectors in i_blocks. * We need to be 1 filesystem block less than the 2^32 sector limit. */ -static loff_t ext3_max_size(int bits) +static loff_t ext3_max_size(int bits, struct super_block *sb) { loff_t res = EXT3_NDIR_BLOCKS; /* This constant is calculated to be the largest file size for a * dense, 4k-blocksize file such that the total number of * sectors in the file, including data and all indirect blocks, * does not exceed 2^32. */ - const loff_t upper_limit = 0x1ff7fffd000LL; + loff_t upper_limit; + if(EXT3_HAS_INCOMPAT_FEATURE(sb, + EXT3_FEATURE_INCOMPAT_LARGE_BLOCK)) { + upper_limit = (1LL << (bits + 32)) - 1; + } else { + upper_limit = 0x1ff7fffd000LL; + } res += 1LL << (bits-2); res += 1LL << (2*(bits-2)); @@ -1512,7 +1518,7 @@ static int ext3_fill_super (struct super } } - sb->s_maxbytes = ext3_max_size(sb->s_blocksize_bits); + sb->s_maxbytes = ext3_max_size(sb->s_blocksize_bits, sb); if (le32_to_cpu(es->s_rev_level) == EXT3_GOOD_OLD_REV) { sbi->s_inode_size = EXT3_GOOD_OLD_INODE_SIZE; @@ -1703,6 +1709,15 @@ static int ext3_fill_super (struct super */ root = iget(sb, EXT3_ROOT_INO); + /* To appoint -O large block option, LSF needs to be enabled */ + if (EXT3_HAS_INCOMPAT_FEATURE(sb, + EXT3_FEATURE_INCOMPAT_LARGE_BLOCK)) { + if (sizeof(root->i_blocks) < sizeof(u64)) { + printk(KERN_ERR "EXT3-fs: %s: Unsupported large block option"\ + "with LSF disabled.\n", sb->s_id); + goto failed_mount; + } + } sb->s_root = d_alloc_root(root); if (!sb->s_root) { printk(KERN_ERR "EXT3-fs: get root inode failed\n"); diff -upNr -X linux-2.6.17-rc1/Documentation/dontdiff linux-2.6.17-rc1.tmp/include/linux/ext3_fs.h linux-2.6.17-rc1.tmp2/include/linux/ext3_fs.h --- linux-2.6.17-rc1.tmp/include/linux/ext3_fs.h 2006-04-07 08:56:16.000000000 +0900 +++ linux-2.6.17-rc1.tmp2/include/linux/ext3_fs.h 2006-04-07 09:02:09.000000000 +0900 @@ -99,6 +99,7 @@ struct statfs; #else # define EXT3_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) #endif +#define EXT3_SECTOR_BITS 9 /* log2(SECTOR_SIZE) */ #ifdef __KERNEL__ #define EXT3_ADDR_PER_BLOCK_BITS(s) (EXT3_SB(s)->s_addr_per_block_bits) #define EXT3_INODE_SIZE(s) (EXT3_SB(s)->s_inode_size) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |