From 0cbe7d44ab8b726dcc77fa25b9d85aa78ceac0f2 Mon Sep 17 00:00:00 2001 From: anfei zhou Date: Tue, 2 Feb 2010 13:44:02 -0800 Subject: [PATCH] --- yaml --- r: 180173 b: refs/heads/master c: 931e80e4b3263db75c8e34f078d22f11bbabd3a3 h: refs/heads/master i: 180171: eefddb548a33bf37c670d96f0f04664702d6ce7f v: v3 --- [refs] | 2 +- trunk/fs/fuse/file.c | 3 +++ trunk/mm/filemap.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 91ad7cc7e4b1..6d7f27ea8377 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc173f7092c76a7967f135c2b3a54052ad99733b +refs/heads/master: 931e80e4b3263db75c8e34f078d22f11bbabd3a3 diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index c18913a777ae..a9f5e137f1d3 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/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(); diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index e3736923220e..698ea80f2102 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -2232,6 +2232,9 @@ static ssize_t generic_perform_write(struct file *file, if (unlikely(status)) break; + if (mapping_writably_mapped(mapping)) + flush_dcache_page(page); + pagefault_disable(); copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes); pagefault_enable();