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

Commit 902be4c5 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o
Browse files

ext2: Fix the max file size for ext2 file system. 



The max file size for ext2 file system is now calculated
with hardcoded 4K block size. The patch fixes it to be
calculated with the right block size.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent e2b46574

fs/ext2/super.c

+28 −4
Original line number Original line Diff line number Diff line
@@ -680,11 +680,31 @@ static int ext2_check_descriptors (struct super_block * sb) 
static loff_t ext2_max_size(int bits)

static loff_t ext2_max_size(int bits)

{

{

	loff_t res = EXT2_NDIR_BLOCKS;

	loff_t res = EXT2_NDIR_BLOCKS;

	/* This constant is calculated to be the largest file size for a

	int meta_blocks;

	 * dense, 4k-blocksize file such that the total number of

	loff_t upper_limit;



	/* This is calculated to be the largest file size for a

	 * dense, file such that the total number of

	 * sectors in the file, including data and all indirect blocks,

	 * sectors in the file, including data and all indirect blocks,

	 * does not exceed 2^32. */

	 * does not exceed 2^32 -1

	const loff_t upper_limit = 0x1ff7fffd000LL;

	 * __u32 i_blocks representing the total number of

	 * 512 bytes blocks of the file

	 */

	upper_limit = (1LL << 32) - 1;



	/* total blocks in file system block size */

	upper_limit >>= (bits - 9);





	/* indirect blocks */

	meta_blocks = 1;

	/* double indirect blocks */

	meta_blocks += 1 + (1LL << (bits-2));

	/* tripple indirect blocks */

	meta_blocks += 1 + (1LL << (bits-2)) + (1LL << (2*(bits-2)));



	upper_limit -= meta_blocks;

	upper_limit <<= bits;





	res += 1LL << (bits-2);

	res += 1LL << (bits-2);

	res += 1LL << (2*(bits-2));

	res += 1LL << (2*(bits-2));
@@ -692,6 +712,10 @@ static loff_t ext2_max_size(int bits) 
	res <<= bits;

	res <<= bits;

	if (res > upper_limit)

	if (res > upper_limit)

		res = upper_limit;

		res = upper_limit;



	if (res > MAX_LFS_FILESIZE)

		res = MAX_LFS_FILESIZE;



	return res;

	return res;

}

}