Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0939221e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes_for_v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull udf fixes from Jan Kara:
 "Two udf error handling fixes"

* tag 'fixes_for_v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Propagate errors from udf_truncate_extents()
  udf: Fix crash on IO error during truncate
parents 7294fbd4 2b42be5e

fs/udf/inode.c

+3 −1
Original line number Diff line number Diff line
@@ -1242,8 +1242,10 @@ int udf_setsize(struct inode *inode, loff_t newsize) 
		truncate_setsize(inode, newsize);

		down_write(&iinfo->i_data_sem);

		udf_clear_extent_cache(inode);

		udf_truncate_extents(inode);

		err = udf_truncate_extents(inode);

		up_write(&iinfo->i_data_sem);

		if (err)

			return err;

	}

update_time:

	inode->i_mtime = inode->i_ctime = current_time(inode);

fs/udf/truncate.c

+6 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void udf_update_alloc_ext_desc(struct inode *inode, 
 * for making file shorter. For making file longer, udf_extend_file() has to

 * be used.

 */

void udf_truncate_extents(struct inode *inode)

int udf_truncate_extents(struct inode *inode)

{

	struct extent_position epos;

	struct kernel_lb_addr eloc, neloc = {};
@@ -224,7 +224,7 @@ void udf_truncate_extents(struct inode *inode) 
	if (etype == -1) {

		/* We should extend the file? */

		WARN_ON(byte_offset);

		return;

		return 0;

	}

	epos.offset -= adsize;

	extent_trunc(inode, &epos, &eloc, etype, elen, byte_offset);
@@ -260,6 +260,9 @@ void udf_truncate_extents(struct inode *inode) 
			epos.block = eloc;

			epos.bh = udf_tread(sb,

					udf_get_lb_pblock(sb, &eloc, 0));

			/* Error reading indirect block? */

			if (!epos.bh)

				return -EIO;

			if (elen)

				indirect_ext_len =

					(elen + sb->s_blocksize - 1) >>
@@ -283,4 +286,5 @@ void udf_truncate_extents(struct inode *inode) 
	iinfo->i_lenExtents = inode->i_size;



	brelse(epos.bh);

	return 0;

}

fs/udf/udfdecl.h

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ extern struct inode *udf_new_inode(struct inode *, umode_t); 
/* truncate.c */

extern void udf_truncate_tail_extent(struct inode *);

extern void udf_discard_prealloc(struct inode *);

extern void udf_truncate_extents(struct inode *);

extern int udf_truncate_extents(struct inode *);



/* balloc.c */

extern void udf_free_blocks(struct super_block *, struct inode *,