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

593bd5e5 · Linus Torvalds <[email protected]> · 2020-06-13 12:44:30 -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 >2GB on a 32-bit machine

Commit: 593bd5e5d3e245262c40c7dd2f5edbac705ff578
Parents: c5557227 · d4ff3b2e

Merge commit. Changes below are compared with the first parent: c5557227.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/iomap/buffered-io.c	modified	+1	−1	View file

fs/iomap/buffered-io.c

View file

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index a1ed762..bcfc288 100644
--- 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))