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

Commit c227390c authored by Dave Kleikamp's avatar Dave Kleikamp Committed by Linus Torvalds
Browse files

jfs should use MAX_LFS_FILESIZE when calculating s_maxbytes 



jfs had previously avoided the use of MAX_LFS_FILESIZE because it hadn't
accounted for the whole 32-bit index range on 32-bit systems.  That has
been fixed by commit 0cc3b0ec ("Clarify (and fix) MAX_LFS_FILESIZE
macros"), so we can simplify the code now.

Suggested by Andreas Dilger.

Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Cc: jfs-discussion@lists.sourceforge.net
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42ff72cf

fs/jfs/super.c

+3 −9
Original line number Diff line number Diff line
@@ -619,16 +619,10 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) 
	if (!sb->s_root)

		goto out_no_root;



	/* logical blocks are represented by 40 bits in pxd_t, etc. */

	sb->s_maxbytes = ((u64) sb->s_blocksize) << 40;

#if BITS_PER_LONG == 32

	/*

	 * Page cache is indexed by long.

	 * I would use MAX_LFS_FILESIZE, but it's only half as big

	/* logical blocks are represented by 40 bits in pxd_t, etc.

	 * and page cache is indexed by long

	 */

	sb->s_maxbytes = min(((u64) PAGE_SIZE << 32) - 1,

			     (u64)sb->s_maxbytes);

#endif

	sb->s_maxbytes = min(((loff_t)sb->s_blocksize) << 40, MAX_LFS_FILESIZE);

	sb->s_time_gran = 1;

	return 0;