aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-02-26 11:45:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 15:00:57 +0100
commit12bda52e8f3720c7398e95b10462b185a7dafa4b (patch)
tree6d396c592130d37b7b722fd67d869548bc9fb17c /fs
parentce6f883465ceb83908bd2385fd91145a466f3715 (diff)
downloadlinux-linaro-stable-12bda52e8f3720c7398e95b10462b185a7dafa4b.tar.gz
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 c46f29082bb9..b535008b6c4c 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1725,6 +1725,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);