[PATCH 3/5] splice: turn wait_for_space flags argument into bool
Askar Safin <[email protected]>
| Newsgroups | org.kernel.vger.linux-api,dev.linux.lists.fuse-devel,dev.linux.lists.patches,it.linux.lists.ltp,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel,org.kernel.vger.netdev,org.kvack.linux-mm |
|---|---|
| Message-ID | <[email protected]> |
I want to do this, because I will move this function to fs/pipe.c. Signed-off-by: Askar Safin <[email protected]> --- fs/splice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 6ddf7dd72..707db2c2c 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1239,7 +1239,7 @@ ssize_t splice_file_range(struct file *in, loff_t *ppos, struct file *out, } EXPORT_SYMBOL(splice_file_range); -static int wait_for_space(struct pipe_inode_info *pipe, unsigned flags) +static int wait_for_space(struct pipe_inode_info *pipe, bool non_block) { for (;;) { if (unlikely(!pipe->readers)) { @@ -1248,7 +1248,7 @@ static int wait_for_space(struct pipe_inode_info *pipe, unsigned flags) } if (!pipe_is_full(pipe)) return 0; - if (flags & SPLICE_F_NONBLOCK) + if (non_block) return -EAGAIN; if (signal_pending(current)) return -ERESTARTSYS; @@ -1268,7 +1268,7 @@ ssize_t splice_file_to_pipe(struct file *in, ssize_t ret; pipe_lock(opipe); - ret = wait_for_space(opipe, flags); + ret = wait_for_space(opipe, flags & SPLICE_F_NONBLOCK); if (!ret) ret = do_splice_read(in, offset, opipe, len, flags); pipe_unlock(opipe); -- 2.47.3