Commit 00c285d0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2bc01060

fs/splice.c

+2 −8
Original line number Diff line number Diff line
@@ -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);

}



/*