diff --git a/[refs] b/[refs] index dfe47cc21aba..79d80f3af038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e941bc0dd787cd79da3aa7cf1fe0bc1eca6c0b2d +refs/heads/master: acdb37c361dc87e165889a504e291c1e82ae133c diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 9eca476227d5..d37431dd60a1 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -1283,6 +1283,7 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, * @in: file to splice from * @ppos: input file offset * @out: file to splice to + * @opos: output file offset * @len: number of bytes to splice * @flags: splice modifier flags *