Skip to content

Commit 7b8c854

Browse files
committed
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 parents fc7b76c + 23970a1 commit 7b8c854

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

fs/udf/inode.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ static void udf_do_extend_final_block(struct inode *inode,
595595
*/
596596
if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK))
597597
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);
599599
last_ext->extLength += added_bytes;
600600
UDF_I(inode)->i_lenExtents += added_bytes;
601601

@@ -684,7 +684,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
684684
struct kernel_lb_addr eloc, tmpeloc;
685685
int c = 1;
686686
loff_t lbcount = 0, b_off = 0;
687-
udf_pblk_t newblocknum, newblock;
687+
udf_pblk_t newblocknum, newblock = 0;
688688
sector_t offset = 0;
689689
int8_t etype;
690690
struct udf_inode_info *iinfo = UDF_I(inode);
@@ -787,7 +787,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
787787
ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
788788
if (ret < 0) {
789789
*err = ret;
790-
newblock = 0;
791790
goto out_free;
792791
}
793792
c = 0;
@@ -852,7 +851,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
852851
goal, err);
853852
if (!newblocknum) {
854853
*err = -ENOSPC;
855-
newblock = 0;
856854
goto out_free;
857855
}
858856
if (isBeyondEOF)

0 commit comments

Comments
 (0)