Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-4
+2
-4
fs/udf/inode.c
+2
-4
fs/udf/inode.c
···
595
595
*/
596
596
if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK))
597
597
return;
598
-
added_bytes = (last_ext->extLength & UDF_EXTENT_LENGTH_MASK) - new_elen;
598
+
added_bytes = new_elen - (last_ext->extLength & UDF_EXTENT_LENGTH_MASK);
599
599
last_ext->extLength += added_bytes;
600
600
UDF_I(inode)->i_lenExtents += added_bytes;
601
601
···
684
684
struct kernel_lb_addr eloc, tmpeloc;
685
685
int c = 1;
686
686
loff_t lbcount = 0, b_off = 0;
687
-
udf_pblk_t newblocknum, newblock;
687
+
udf_pblk_t newblocknum, newblock = 0;
688
688
sector_t offset = 0;
689
689
int8_t etype;
690
690
struct udf_inode_info *iinfo = UDF_I(inode);
···
787
787
ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
788
788
if (ret < 0) {
789
789
*err = ret;
790
-
newblock = 0;
791
790
goto out_free;
792
791
}
793
792
c = 0;
···
851
852
goal, err);
852
853
if (!newblocknum) {
853
854
*err = -ENOSPC;
854
-
newblock = 0;
855
855
goto out_free;
856
856
}
857
857
if (isBeyondEOF)