mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-04 22:21:23 +00:00
ufs: fix truncated values handling 64 bit metadata
Originally i_lastfrag was 32 bits but then we added support for handling
64 bit metadata and it became a 64 bit variable. That was during 2007, in
54fb996ac1
"[PATCH] ufs2 write: block allocation update". Unfortunately
these casts got left behind so the value got truncated to 32 bit again.
[akpm@linux-foundation.org: remove now-unneeded min_t/max_t casting]
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9796cc964d
commit
1d5827235d
@ -424,8 +424,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
|
||||
ufs_cpu_to_data_ptr(sb, p, result);
|
||||
*err = 0;
|
||||
UFS_I(inode)->i_lastfrag =
|
||||
max_t(u32, UFS_I(inode)->i_lastfrag,
|
||||
fragment + count);
|
||||
max(UFS_I(inode)->i_lastfrag, fragment + count);
|
||||
ufs_clear_frags(inode, result + oldcount,
|
||||
newcount - oldcount, locked_page != NULL);
|
||||
}
|
||||
@ -440,7 +439,8 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
|
||||
result = ufs_add_fragments (inode, tmp, oldcount, newcount, err);
|
||||
if (result) {
|
||||
*err = 0;
|
||||
UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count);
|
||||
UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,
|
||||
fragment + count);
|
||||
ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
|
||||
locked_page != NULL);
|
||||
unlock_super(sb);
|
||||
@ -479,7 +479,8 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
|
||||
uspi->s_sbbase + result, locked_page);
|
||||
ufs_cpu_to_data_ptr(sb, p, result);
|
||||
*err = 0;
|
||||
UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count);
|
||||
UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,
|
||||
fragment + count);
|
||||
unlock_super(sb);
|
||||
if (newcount < request)
|
||||
ufs_free_fragments (inode, result + newcount, request - newcount);
|
||||
|
@ -84,7 +84,7 @@ static int ufs_trunc_direct(struct inode *inode)
|
||||
retry = 0;
|
||||
|
||||
frag1 = DIRECT_FRAGMENT;
|
||||
frag4 = min_t(u32, UFS_NDIR_FRAGMENT, ufsi->i_lastfrag);
|
||||
frag4 = min_t(u64, UFS_NDIR_FRAGMENT, ufsi->i_lastfrag);
|
||||
frag2 = ((frag1 & uspi->s_fpbmask) ? ((frag1 | uspi->s_fpbmask) + 1) : frag1);
|
||||
frag3 = frag4 & ~uspi->s_fpbmask;
|
||||
block1 = block2 = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user