diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-06-09 04:15:45 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 20:30:53 +0300 |
| commit | 981b726802cc71b54d67ab48804321a6a64e1907 (patch) | |
| tree | 052fc6860d4839b23ea7fa3df4f89c378b933961 /fs | |
| parent | afb0675c54fa0c2407845257b5b46e35e7311818 (diff) | |
| download | linux-981b726802cc71b54d67ab48804321a6a64e1907.tar.xz | |
ufs: set correct ->s_maxsize
commit 6b0d144fa758869bdd652c50aa41aaf601232550 upstream.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ufs/super.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 3915ade6f9a8..c7090f5b24b6 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -695,6 +695,23 @@ static void ufs_put_super_internal(struct super_block *sb) UFSD("EXIT\n"); } +static u64 ufs_max_bytes(struct super_block *sb) +{ + struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; + int bits = uspi->s_apbshift; + u64 res; + + if (bits > 21) + res = ~0ULL; + else + res = UFS_NDADDR + (1LL << bits) + (1LL << (2*bits)) + + (1LL << (3*bits)); + + if (res >= (MAX_LFS_FILESIZE >> uspi->s_bshift)) + return MAX_LFS_FILESIZE; + return res << uspi->s_bshift; +} + static int ufs_fill_super(struct super_block *sb, void *data, int silent) { struct ufs_sb_info * sbi; @@ -1157,6 +1174,7 @@ magic_found: "fast symlink size (%u)\n", uspi->s_maxsymlinklen); uspi->s_maxsymlinklen = maxsymlen; } + sb->s_maxbytes = ufs_max_bytes(sb); inode = ufs_iget(sb, UFS_ROOTINO); if (IS_ERR(inode)) { |