On Thu, Nov 23, 2023 at 6:22 PM Christian Brauner <brauner@xxxxxxxxxx> wrote:
>
> > > diff --git a/fs/splice.c b/fs/splice.c
> > > index d983d375ff1130..982a0872fa03e9 100644
> > > --- a/fs/splice.c
> > > +++ b/fs/splice.c
> > > @@ -684,6 +684,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
> > >
> > > splice_from_pipe_begin(&sd);
> > > while (sd.total_len) {
> > > + struct kiocb kiocb;
> > > struct iov_iter from;
> > > unsigned int head, tail, mask;
> > > size_t left;
> > > @@ -733,7 +734,10 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
> > > }
> > >
> > > iov_iter_bvec(&from, ITER_SOURCE, array, n, sd.total_len - left);
> > > - ret = vfs_iter_write(out, &from, &sd.pos, 0);
> > > + init_sync_kiocb(&kiocb, out);
> > > + kiocb.ki_pos = sd.pos;
> > > + ret = out->f_op->write_iter(&kiocb, &from);
> > > + sd.pos = kiocb.ki_pos;
> > > if (ret <= 0)
> > > break;
> > >
> >
> > Are we open coding call_write_iter() now?
> > Is that a trend that I am not aware of?
>
> I'll fold that in as-is but I'll use call_write_iter() for now.
> We can remove that later. For now consistency matters more.
Stating the obvious - please don't forget to edit the commit message
removing mention of the helper.
Thanks,
Amir.
