diff --git a/[refs] b/[refs] index db71902238fa..61a3b2bbca65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f76208c33984ab777eace5d07a4e36e88703e02 +refs/heads/master: b80901bbf599553f483b9509f2dce416b938aae8 diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 5384a90665d0..666953d59a35 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -614,7 +614,6 @@ static void wakeup_pipe_writers(struct pipe_inode_info *pipe) * @actor: handler that splices the data * * Description: - * This function loops over the pipe and calls @actor to do the * actual moving of a single struct pipe_buffer to the desired * destination. It returns when there's no more buffers left in @@ -711,7 +710,7 @@ EXPORT_SYMBOL(splice_from_pipe_next); /** * splice_from_pipe_begin - start splicing from pipe - * @pipe: pipe to splice from + * @sd: information about the splice operation * * Description: * This function should be called before a loop containing