Skip to content

Commit 00c285d

Browse files
Christoph HellwigAl Viro
authored andcommitted
fs: simplify do_splice_from
No need for a local function pointer when we can trivial branch on the ->splice_write presence. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 2bc0106 commit 00c285d

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/splice.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -852,15 +852,9 @@ EXPORT_SYMBOL(generic_splice_sendpage);
852852
static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
853853
loff_t *ppos, size_t len, unsigned int flags)
854854
{
855-
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
856-
loff_t *, size_t, unsigned int);
857-
858855
if (out->f_op->splice_write)
859-
splice_write = out->f_op->splice_write;
860-
else
861-
splice_write = default_file_splice_write;
862-
863-
return splice_write(pipe, out, ppos, len, flags);
856+
return out->f_op->splice_write(pipe, out, ppos, len, flags);
857+
return default_file_splice_write(pipe, out, ppos, len, flags);
864858
}
865859

866860
/*

0 commit comments

Comments
 (0)