diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-26 17:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-26 17:42:55 -0700 |
| commit | de55eb1d60d2ed0f1ba5e13226d91b3bfbe1c108 (patch) | |
| tree | 8f2a62f811562b4008dd1cd50a0ebf5603b13a76 /fs/splice.c | |
| parent | b175293ccc98ab84e93d25472d7422b4a897614b (diff) | |
| parent | e8cd81693bbbb15db57d3c9aa7dd90eda4842874 (diff) | |
| download | lwn-de55eb1d60d2ed0f1ba5e13226d91b3bfbe1c108.tar.gz lwn-de55eb1d60d2ed0f1ba5e13226d91b3bfbe1c108.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"stable fodder; assorted deadlock fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vt: synchronize_rcu() under spinlock is not nice...
Nest rename_lock inside vfsmount_lock
Don't bother with redoing rw_verify_area() from default_file_splice_from()
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index 718bd0056384..29e394e49ddd 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -31,6 +31,7 @@ #include <linux/security.h> #include <linux/gfp.h> #include <linux/socket.h> +#include "internal.h" /* * Attempt to steal a page from a pipe buffer. This should perhaps go into @@ -1048,9 +1049,10 @@ static int write_pipe_buf(struct pipe_inode_info *pipe, struct pipe_buffer *buf, { int ret; void *data; + loff_t tmp = sd->pos; data = buf->ops->map(pipe, buf, 0); - ret = kernel_write(sd->u.file, data + buf->offset, sd->len, sd->pos); + ret = __kernel_write(sd->u.file, data + buf->offset, sd->len, &tmp); buf->ops->unmap(pipe, buf, data); return ret; |