diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2017-08-31 16:46:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-31 17:02:21 -0700 |
| commit | c227390c91a355300f47f9bef0aefbdfaaca1500 (patch) | |
| tree | 0e2d9bd9eb695c55da12ccb7419ca90ccc26ebbd /fs/jfs | |
| parent | 42ff72cf27027fa28dd79acabe01d9196f1480a7 (diff) | |
| download | linux-stable-c227390c91a355300f47f9bef0aefbdfaaca1500.tar.gz linux-stable-c227390c91a355300f47f9bef0aefbdfaaca1500.tar.bz2 linux-stable-c227390c91a355300f47f9bef0aefbdfaaca1500.zip | |
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 0cc3b0ec23ce ("Clarify (and fix) MAX_LFS_FILESIZE
macros"), so we can simplify the code now.
Suggested by Andreas Dilger.
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Cc: jfs-discussion@lists.sourceforge.net
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/super.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 78b41e1d5c67..60726ae7cf26 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -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; |