diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-03 15:52:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-03 15:52:19 -0700 |
| commit | ae03c53d005ef8a1e0253ad67b7b62103ea1fae6 (patch) | |
| tree | 2c3ebbe7a97c6b5e69add4a67723f89df73533f8 /fs/fuse | |
| parent | 039aeb9deb9291f3b19c375a8bc6fa7f768996cc (diff) | |
| parent | c928f642c29a5ffb02e16f2430b42b876dde69de (diff) | |
| download | linux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.tar.gz linux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.tar.bz2 linux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.zip | |
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice updates from Al Viro:
"Christoph's assorted splice cleanups"
* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: rename pipe_buf ->steal to ->try_steal
fs: make the pipe_buf_operations ->confirm operation optional
fs: make the pipe_buf_operations ->steal operation optional
trace: remove tracing_pipe_buf_ops
pipe: merge anon_pipe_buf*_ops
fs: simplify do_splice_from
fs: simplify do_splice_to
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index c7a65cf2bcca..4907e3d1f56c 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -805,7 +805,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) if (cs->len != PAGE_SIZE) goto out_fallback; - if (pipe_buf_steal(cs->pipe, buf) != 0) + if (!pipe_buf_try_steal(cs->pipe, buf)) goto out_fallback; newpage = buf->page; |