diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 22:20:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 22:20:18 +0100 |
| commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
| tree | f3736a97725647393a2db7c95462d857115197ca /fs/fuse/file.c | |
| parent | Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into dev... (diff) | |
| parent | [ARM] orion5x: D-link DNS-323 revision A1 power LED (diff) | |
| download | linux-56012808f4d5606e401539f663d92009d964425b.tar.xz linux-56012808f4d5606e401539f663d92009d964425b.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'fs/fuse/file.c')
| -rw-r--r-- | fs/fuse/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index c18913a777ae..a9f5e137f1d3 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -828,6 +828,9 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, if (!page) break; + if (mapping_writably_mapped(mapping)) + flush_dcache_page(page); + pagefault_disable(); tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); pagefault_enable(); |