From: Christoph Hellwig Date: Wed, 20 May 2020 15:58:11 +0000 (+0200) Subject: fs: simplify do_splice_from X-Git-Tag: v5.8-rc1~167^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00c285d0d0fe4606d20fe88f1c824962475ba880;p=thirdparty%2Flinux.git 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 Signed-off-by: Al Viro --- diff --git a/fs/splice.c b/fs/splice.c index 77b10f45a3dac..88942bf177d16 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -852,15 +852,9 @@ EXPORT_SYMBOL(generic_splice_sendpage); static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, loff_t *ppos, size_t len, unsigned int flags) { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); - if (out->f_op->splice_write) - splice_write = out->f_op->splice_write; - else - splice_write = default_file_splice_write; - - return splice_write(pipe, out, ppos, len, flags); + return out->f_op->splice_write(pipe, out, ppos, len, flags); + return default_file_splice_write(pipe, out, ppos, len, flags); } /*