lkml.org 
[lkml]   [2017]   [Aug]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] jfs should use MAX_LFS_FILESIZE when calculating s_maxbytes
Date
On Aug 31, 2017, at 3:46 PM, Dave Kleikamp <dave.kleikamp@oracle.com> wrote:
>
> 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, so we can simplify the code now.
>
> Suggested by Andreas Dilger.
>
> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
> Cc: Andreas Dilger <adilger@dilger.ca>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> Cc: jfs-discussion@lists.sourceforge.net
> ---
> Linus,
> If you don't want to pick this up now, I'll push it in the next merge
> window.
>
> fs/jfs/super.c | 12 +++---------
> 1 file 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;
>
> --
> 2.14.1
>


Cheers, Andreas





[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2017-09-01 00:39    [W:0.043 / U:2.684 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site