aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 15:46:35 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-02 15:46:35 -0400
commit29e350944fdc2dfca102500790d8ad6d6ff4f69d (patch)
tree7630809d75149b0053dcc45ad34e95d5506e88b3 /include/linux
parentb45e516f701e0fc81fb3dbd1ba9db35f991a4465 (diff)
splice: add SPLICE_F_NONBLOCK flag
It doesn't make the splice itself necessarily nonblocking (because the actual file descriptors that are spliced from/to may block unless they have the O_NONBLOCK flag set), but it makes the splice pipe operations nonblocking. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pipe_fs_i.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 75c7f55023ab..d218fc729319 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -60,5 +60,8 @@ void free_pipe_info(struct inode* inode);
60 * add the splice flags here. 60 * add the splice flags here.
61 */ 61 */
62#define SPLICE_F_MOVE (0x01) /* move pages instead of copying */ 62#define SPLICE_F_MOVE (0x01) /* move pages instead of copying */
63#define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */
64 /* we may still block on the fd we splice */
65 /* from/to, of course */
63 66
64#endif 67#endif