From: Christoph Hellwig Date: Wed, 20 May 2020 15:58:10 +0000 (+0200) Subject: fs: simplify do_splice_to X-Git-Tag: v5.8-rc1~167^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bc010600d0a8add4470eb37e1ccca8aaa3d0070;p=thirdparty%2Fkernel%2Flinux.git fs: simplify do_splice_to No need for a local function pointer when we can trivial branch on the ->splice_read presence. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro --- diff --git a/fs/splice.c b/fs/splice.c index 4735defc46ee6..77b10f45a3dac 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -870,8 +870,6 @@ static long do_splice_to(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); int ret; if (unlikely(!(in->f_mode & FMODE_READ))) @@ -885,11 +883,8 @@ static long do_splice_to(struct file *in, loff_t *ppos, len = MAX_RW_COUNT; if (in->f_op->splice_read) - splice_read = in->f_op->splice_read; - else - splice_read = default_file_splice_read; - - return splice_read(in, ppos, pipe, len, flags); + return in->f_op->splice_read(in, ppos, pipe, len, flags); + return default_file_splice_read(in, ppos, pipe, len, flags); } /**