diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-22 08:42:20 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-22 08:42:20 -1000 |
| commit | b8ff768b5ab9d17204c1a8b3647ee6db608f63ab (patch) | |
| tree | 7be3d5a4ac5a8e3d68ab9259d69add29c2998a07 /fs/internal.h | |
| parent | f71194a7d47c1da787555d27aac63973ca72323b (diff) | |
| parent | 945fb136dfcb5291b4fb2abd4fd1edf790de44ff (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Several fixes for bugs caught while looking through f_pos (ab)users"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aout32 coredump compat fix
splice: don't pass the address of ->f_pos to methods
mconsole: we'd better initialize pos before passing it to vfs_read()...
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/internal.h b/fs/internal.h index eaa75f75b625..68121584ae37 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -132,6 +132,12 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *); extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *); /* + * splice.c + */ +extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, + loff_t *opos, size_t len, unsigned int flags); + +/* * pipe.c */ extern const struct file_operations pipefifo_fops; |