summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-02-26 11:45:47 +0100
committerZefan Li <lizefan@huawei.com>2015-06-19 11:40:24 +0800
commit4ff89df0641aba81907245ba2caff741c6535fad (patch)
treeeb534365ea3c3d5c3b20477a554f4d632eb78363
parent7b96cea2eb026957c042a5cf6785e60e25674709 (diff)
fuse: notify: don't move pages
commit 0d2783626a53d4c922f82d51fa675cb5d13f0d36 upstream. fuse_try_move_page() is not prepared for replacing pages that have already been read. Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--fs/fuse/dev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index f4246cfc8d87..8b3fd48a491e 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1634,6 +1634,9 @@ copy_finish:
static int fuse_notify(struct fuse_conn *fc, enum fuse_notify_code code,
unsigned int size, struct fuse_copy_state *cs)
{
+ /* Don't try to move pages (yet) */
+ cs->move_pages = 0;
+
switch (code) {
case FUSE_NOTIFY_POLL:
return fuse_notify_poll(fc, size, cs);