aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2015-02-26 11:45:47 +0100
committerSasha Levin <sasha.levin@oracle.com>2015-03-28 09:33:41 -0400
commit78df56cca6dcf5f2d8c65b642a3bbf2b199c8e88 (patch)
tree79fdf851eabc358112dd9731e975af3fdc96dda9 /fs
parent9525473566852df009ead45cf4d70c40452dd38a (diff)
fuse: notify: don't move pages
[ Upstream commit 0d2783626a53d4c922f82d51fa675cb5d13f0d36 ] 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> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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 cc756cb0427a..f2bbb8513360 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);