diff options
| author | David Barksdale <amatus@amatus.name> | 2014-08-13 18:11:53 -0500 |
|---|---|---|
| committer | David Barksdale <amatus@amatus.name> | 2014-08-13 18:11:53 -0500 |
| commit | 3918522a523adc3f001cf9c5da327d8fb383c26e (patch) | |
| tree | 424b4a37d021e6a5fd02c3abbf9b6a054e469208 /fs | |
| parent | f05c100b6a7051106229cda5a845e94e36e71b17 (diff) | |
gpl-source-mybooklive-020202.zipgpl-source-mybooklive-020202.zipgpl-source-mybooklive-02.03.01-028.zipgpl-source-mybooklive-02.03.01-024.zip
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/splice.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/splice.c b/fs/splice.c index 5a21493e9e8..0d810e86f6c 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -2599,22 +2599,20 @@ 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; } |