diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
| commit | 93da8b221da95a97316e518c94f03856e5d610a9 (patch) | |
| tree | 23787f3c0d02507f20d804aac23ef209d66a7586 /fs/iomap.c | |
| parent | ba63f76e22ee723819c8cec86b31f7ea3182b2ed (diff) | |
| parent | 143c97cc652949893c8056c679012f0aeccb80e5 (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 039266128b7f..59cc98ad7577 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -278,7 +278,7 @@ iomap_dirty_actor(struct inode *inode, loff_t pos, loff_t length, void *data, unsigned long bytes; /* Bytes to write to page */ offset = (pos & (PAGE_SIZE - 1)); - bytes = min_t(unsigned long, PAGE_SIZE - offset, length); + bytes = min_t(loff_t, PAGE_SIZE - offset, length); rpage = __iomap_read_page(inode, pos); if (IS_ERR(rpage)) @@ -373,7 +373,7 @@ iomap_zero_range_actor(struct inode *inode, loff_t pos, loff_t count, unsigned offset, bytes; offset = pos & (PAGE_SIZE - 1); /* Within page */ - bytes = min_t(unsigned, PAGE_SIZE - offset, count); + bytes = min_t(loff_t, PAGE_SIZE - offset, count); if (IS_DAX(inode)) status = iomap_dax_zero(pos, offset, bytes, iomap); |