Commit 7b8c854c authored by Linus Torvalds's avatar Linus Torvalds

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
parents fc7b76c4 23970a1c
...@@ -595,7 +595,7 @@ static void udf_do_extend_final_block(struct inode *inode, ...@@ -595,7 +595,7 @@ static void udf_do_extend_final_block(struct inode *inode,
*/ */
if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK)) if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK))
return; 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; last_ext->extLength += added_bytes;
UDF_I(inode)->i_lenExtents += added_bytes; UDF_I(inode)->i_lenExtents += added_bytes;
...@@ -684,7 +684,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, ...@@ -684,7 +684,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
struct kernel_lb_addr eloc, tmpeloc; struct kernel_lb_addr eloc, tmpeloc;
int c = 1; int c = 1;
loff_t lbcount = 0, b_off = 0; loff_t lbcount = 0, b_off = 0;
udf_pblk_t newblocknum, newblock; udf_pblk_t newblocknum, newblock = 0;
sector_t offset = 0; sector_t offset = 0;
int8_t etype; int8_t etype;
struct udf_inode_info *iinfo = UDF_I(inode); struct udf_inode_info *iinfo = UDF_I(inode);
...@@ -787,7 +787,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, ...@@ -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); ret = udf_do_extend_file(inode, &prev_epos, laarr, hole_len);
if (ret < 0) { if (ret < 0) {
*err = ret; *err = ret;
newblock = 0;
goto out_free; goto out_free;
} }
c = 0; c = 0;
...@@ -852,7 +851,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, ...@@ -852,7 +851,6 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
goal, err); goal, err);
if (!newblocknum) { if (!newblocknum) {
*err = -ENOSPC; *err = -ENOSPC;
newblock = 0;
goto out_free; goto out_free;
} }
if (isBeyondEOF) if (isBeyondEOF)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment