projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
iomap.c
diff --git
a/fs/iomap.c
b/fs/iomap.c
index
013d1d3
..
a8ee8c3
100644
(file)
--- a/
fs/iomap.c
+++ b/
fs/iomap.c
@@
-433,8
+433,7
@@
iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length,
struct page *page = data;
int ret;
struct page *page = data;
int ret;
- ret = __block_write_begin_int(page, pos & ~PAGE_MASK, length,
- NULL, iomap);
+ ret = __block_write_begin_int(page, pos, length, NULL, iomap);
if (ret)
return ret;
if (ret)
return ret;
@@
-561,7
+560,7
@@
int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,
}
while (len > 0) {
}
while (len > 0) {
- ret = iomap_apply(inode, start, len,
0
, ops, &ctx,
+ ret = iomap_apply(inode, start, len,
IOMAP_REPORT
, ops, &ctx,
iomap_fiemap_actor);
/* inode with no (attribute) mapping will give ENOENT */
if (ret == -ENOENT)
iomap_fiemap_actor);
/* inode with no (attribute) mapping will give ENOENT */
if (ret == -ENOENT)