diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 12:44:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 12:44:30 -0700 |
| commit | 593bd5e5d3e245262c40c7dd2f5edbac705ff578 (patch) | |
| tree | 95eb170e8ff436acc843cf833c3ce33f3db6a2cd /fs/iomap | |
| parent | Merge tag 'xfs-5.8-merge-9' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| parent | iomap: Fix unsharing of an extent >2GB on a 32-bit machine (diff) | |
| download | linux-dev-593bd5e5d3e245262c40c7dd2f5edbac705ff578.tar.xz linux-dev-593bd5e5d3e245262c40c7dd2f5edbac705ff578.zip | |
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/iomap')
| -rw-r--r-- | fs/iomap/buffered-io.c | 2 |
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)) |