Commit 593bd5e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iomap-5.8-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull iomap fix from Darrick Wong:
 "A single iomap bug fix for a variable type mistake on 32-bit
  architectures, fixing an integer overflow problem in the unshare
  actor"

* tag 'iomap-5.8-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: Fix unsharing of an extent >2GB on a 32-bit machine
parents c5557227 d4ff3b2e

fs/iomap/buffered-io.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
		struct iomap *iomap, struct iomap *srcmap)

{

	long status = 0;

	ssize_t written = 0;

	loff_t written = 0;



	/* don't bother with blocks that are not shared to start with */

	if (!(iomap->flags & IOMAP_F_SHARED))