summaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-02-26 11:45:47 +0100
committerLuis Henriques <luis.henriques@canonical.com>2015-03-30 11:10:40 +0100
commit96d2e901a5e43aeae47c7e0f4983fda439fbaa28 (patch)
tree591cde52a818387b5dd5f7e80cf3454ea81265b5 /fs/fuse
parent0596eeda8839481a3a2d64b07116581c0fc5fa0a (diff)
downloadlinux-stable-96d2e901a5e43aeae47c7e0f4983fda439fbaa28.tar.gz
linux-stable-96d2e901a5e43aeae47c7e0f4983fda439fbaa28.tar.bz2
linux-stable-96d2e901a5e43aeae47c7e0f4983fda439fbaa28.zip
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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/fuse')
-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 ca887314aba9..a221901813a1 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1721,6 +1721,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);