From cddfc3baae08e24185c7716434452ebbd404cd39 Mon Sep 17 00:00:00 2001 From: David Barksdale Date: Wed, 13 Aug 2014 18:32:56 -0500 Subject: gpl-source-mybooklive-02.10.09-124.zip --- fs/splice.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'fs/splice.c') diff --git a/fs/splice.c b/fs/splice.c index 0d810e86f6c..5a21493e9e8 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -2599,20 +2599,22 @@ static long do_splice_2(int fd_in, struct file *in, loff_t __user *off_in, /** handle error status */ if( ret <= 0 ) { +#ifdef DEBUG_SPLICE printk( KERN_ERR "%s:%s:%d\n" "sock_splice_read read error %ld.\n", __FILE__, __FUNCTION__, __LINE__, ret ); - +#endif /** fail on specific errors */ if ( ret == 0 || ! ignore_splice_error ( ret ) ) { +#ifdef DEBUG_SPLICE printk( KERN_ERR "%s:%s:%d\n" "returning read error %ld " "after reading %d out of %d bytes.\n", __FILE__, __FUNCTION__, __LINE__, ret, spliced_len, len ); - +#endif release_splice_pipebufs_special(pipe); goto out; } -- cgit v1.2.3-18-g5258