mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-14 08:13:56 +08:00
\n
-----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEq1nRK9aeMoq1VSgcnJ2qBz9kQNkFAmO4OTYACgkQnJ2qBz9k QNmvZwgA0zeiQq1dY6fFHMn5Fil8FfsjfiD4Kam5L7iwNMF5i2cr8cKYBOack7pd aIcGHOHFj4Xmy0MzVW8rON2gDupJ9mUt9UKWajGsPd4hfPyzfBGD+VJCtPKZeXci aF0aPQ3Ee8ED3/3itIkGutR/t1obt86cUMpF01zsS2m2sxMyeqFWbijqUBRhsFsw tqMuGKJkOq3BdiAcwNahI33YikQxlj6xDQB4ngHrTF3v1XeOyM4d5nX3BCJ/jTLa iU1EGMj/Ga88+8AJvHl+yQ8i0MfrOTYOcjLFlksERbk+dSiDiY/WtVcz4C0N1Dhs AiAcgdKoj3qkf+XrfYBBAhMfO+43XA== =k3GO -----END PGP SIGNATURE----- Merge tag 'fixes_for_v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs Pull UDF fixes from Jan Kara: "Two fixups of the UDF changes that went into 6.2-rc1" * tag 'fixes_for_v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: udf: initialize newblock to 0 udf: Fix extension of the last extent in the file
This commit is contained in:
commit
7b8c854cfe
@ -595,7 +595,7 @@ static void udf_do_extend_final_block(struct inode *inode,
|
||||
*/
|
||||
if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK))
|
||||
return;
|
||||
added_bytes = (last_ext->extLength & UDF_EXTENT_LENGTH_MASK) - new_elen;
|
||||
added_bytes = new_elen - (last_ext->extLength & UDF_EXTENT_LENGTH_MASK);
|
||||
last_ext->extLength += added_bytes;
|
||||
UDF_I(inode)->i_lenExtents += added_bytes;
|
||||
|
||||
@ -684,7 +684,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
|
||||
struct kernel_lb_addr eloc, tmpeloc;
|
||||
int c = 1;
|
||||
loff_t lbcount = 0, b_off = 0;
|
||||
udf_pblk_t newblocknum, newblock;
|
||||
udf_pblk_t newblocknum, newblock = 0;
|
||||
sector_t offset = 0;
|
||||
int8_t etype;
|
||||
struct udf_inode_info *iinfo = UDF_I(inode);
|
||||
@ -787,7 +787,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
|
||||
ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
|
||||
if (ret < 0) {
|
||||
*err = ret;
|
||||
newblock = 0;
|
||||
goto out_free;
|
||||
}
|
||||
c = 0;
|
||||
@ -852,7 +851,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
|
||||
goal, err);
|
||||
if (!newblocknum) {
|
||||
*err = -ENOSPC;
|
||||
newblock = 0;
|
||||
goto out_free;
|
||||
}
|
||||
if (isBeyondEOF)
|
||||
|
Loading…
Reference in New Issue
Block a user