diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2020-09-21 08:58:38 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-09-21 08:59:26 -0700 |
| commit | 7ed3cd1a69e3aedb29d4edf0b02624a1833a952d (patch) | |
| tree | d73e48a09b6cdff2ef0428f9c665ae816e27e1d7 /fs/iomap | |
| parent | 6cc19c5fad0908e4e5ed99c2236d740668985364 (diff) | |
| download | linux-stable-7ed3cd1a69e3aedb29d4edf0b02624a1833a952d.tar.gz linux-stable-7ed3cd1a69e3aedb29d4edf0b02624a1833a952d.tar.bz2 linux-stable-7ed3cd1a69e3aedb29d4edf0b02624a1833a952d.zip | |
iomap: Fix misplaced page flushing
If iomap_unshare_actor() unshares to an inline iomap, the page was
not being flushed. block_write_end() and __iomap_write_end() already
contain flushes, so adding it to iomap_write_end_inline() seems like
the best place. That means we can remove it from iomap_write_actor().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/iomap')
| -rw-r--r-- | fs/iomap/buffered-io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 2b4757dba825..d8013f38a317 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -717,6 +717,7 @@ iomap_write_end_inline(struct inode *inode, struct page *page, WARN_ON_ONCE(!PageUptodate(page)); BUG_ON(pos + copied > PAGE_SIZE - offset_in_page(iomap->inline_data)); + flush_dcache_page(page); addr = kmap_atomic(page); memcpy(iomap->inline_data + pos, addr + pos, copied); kunmap_atomic(addr); @@ -810,8 +811,6 @@ again: copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); - flush_dcache_page(page); - status = iomap_write_end(inode, pos, bytes, copied, page, iomap, srcmap); if (unlikely(status < 0)) |