From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761458AbcINIhw (ORCPT ); Wed, 14 Sep 2016 04:37:52 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:34968 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761191AbcINIhm (ORCPT ); Wed, 14 Sep 2016 04:37:42 -0400 From: Miklos Szeredi To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Al Viro Subject: [PATCH 10/11] splice: don't check i_size in generic_file_splice_read() Date: Wed, 14 Sep 2016 10:37:15 +0200 Message-Id: <1473842236-28655-11-git-send-email-mszeredi@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1473842236-28655-1-git-send-email-mszeredi@redhat.com> References: <1473842236-28655-1-git-send-email-mszeredi@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is handled in get_page_for_read() already. Signed-off-by: Miklos Szeredi --- fs/splice.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index e7757b363b6c..bee282803ccf 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -334,20 +334,11 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { - loff_t isize, left; int ret; if (IS_DAX(in->f_mapping->host)) return default_file_splice_read(in, ppos, pipe, len, flags); - isize = i_size_read(in->f_mapping->host); - if (unlikely(*ppos >= isize)) - return 0; - - left = isize - *ppos; - if (unlikely(left < len)) - len = left; - ret = __generic_file_splice_read(in, ppos, pipe, len, flags); if (ret > 0) { *ppos += ret; -- 2.5.5