X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=blobdiff_plain;f=fs%2Ffuse%2Fdev.c;h=74651ad806b60907a60f30723f4d9d4a012788d1;hp=4b90684450f26d9d82e89455a5a51292357fd81b;hb=eff333fa3be237a02175c5f6719ea2c0753b398d;hpb=f5aa73ff5c0753e91c658b6ce6af8baeac9608df

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 4b90684450f2..74651ad806b6 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -865,8 +865,8 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
 
 	newpage = buf->page;
 
-	if (WARN_ON(!PageUptodate(newpage)))
-		return -EIO;
+	if (!PageUptodate(newpage))
+		SetPageUptodate(newpage);
 
 	ClearPageMappedToDisk(newpage);
 
@@ -1771,6 +1771,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);