summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-02-26 11:45:47 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:25 +0100
commit792ad632359f14371d5f19354e3ea69c22e0f5d0 (patch)
tree5425d2661f195b6f8a1d3be073acd46cbbb9b4ce /fs
parentc7ca77cda57088b3d2a51858cb705fd8168a142e (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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
-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 cf0098d26409..a826913e88ac 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1570,6 +1570,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);