summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 22:44:30 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 22:44:30 +0300
commit593bd5e5d3e245262c40c7dd2f5edbac705ff578 (patch)
tree95eb170e8ff436acc843cf833c3ce33f3db6a2cd /fs
parentc55572276834f8b17c859db7d20c224fe25b9eda (diff)
parentd4ff3b2ef901cd451fb8a9ff4623d060a79502cd (diff)
downloadlinux-593bd5e5d3e245262c40c7dd2f5edbac705ff578.tar.xz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/iomap/buffered-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index a1ed7620fbac..bcfc288dba3f 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))