diff options
| author | Jan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de> | 2016-07-26 18:10:47 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 15:59:57 +0200 |
| commit | 66b3b5f4bb0c4811f364332d0268fbc047835d71 (patch) | |
| tree | b0231960b01e71704f67d3c0181352d08dcebdf9 /fs/fuse | |
| parent | d7f59ace74662a703f7b079e61f9cdbc1dcb9ab3 (diff) | |
3.10.72 -> 3.10.73
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 617ab5925..517bee28e 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -896,8 +896,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); @@ -1802,6 +1802,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); |