Merge tag 'xfs-reflink-for-linus-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / fs / fuse / dev.c

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index e5d5cc9..70ea57c 100644 (file)
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -767,7 +767,6 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
                cs->len = err;
                cs->offset = off;
                cs->pg = page;
-               cs->offset = off;
                iov_iter_advance(cs->iter, err);
        }
 
@@ -841,7 +840,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
        if (cs->len != PAGE_SIZE)
                goto out_fallback;
 
-       if (buf->ops->steal(cs->pipe, buf) != 0)
+       if (pipe_buf_steal(cs->pipe, buf) != 0)
                goto out_fallback;
 
        newpage = buf->page;