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

torvalds · torvalds · commit 593bd5e5d3e2 · 2020-06-13T12:44:30.000-07:00
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 &gt;2GB on a 32-bit machine
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ iomap_unshare_actor(struct inode inode, loff_t pos, loff_t length, void data,`
`870`	`870`	`struct iomap iomap, struct iomap srcmap)`
`871`	`871`	`{`
`872`	`872`	`long status = 0;`
`873`		`- ssize_t written = 0;`
	`873`	`+ loff_t written = 0;`
`874`	`874`
`875`	`875`	`/* don't bother with blocks that are not shared to start with */`
`876`	`876`	`if (!(iomap->flags & IOMAP_F_SHARED))`