From patchwork Mon Feb 13 13:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 56302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2360384wrn; Mon, 13 Feb 2023 06:01:50 -0800 (PST) X-Google-Smtp-Source: AK7set+NrMqOuFH8s0ii3WyLJzIqo4bX4Qxaw03P74E0e7tgRR9uv/0AQDc8+MAgDyy1m/2cdDCY X-Received: by 2002:a50:c38a:0:b0:4ac:c9d9:94c with SMTP id h10-20020a50c38a000000b004acc9d9094cmr2617446edf.7.1676296910326; Mon, 13 Feb 2023 06:01:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676296910; cv=none; d=google.com; s=arc-20160816; b=PuffEtkNkfBPoYVpfylJ2bOZ3L/yi/S0ftVyj379zkjnMCuHc5292Z9kQ7qXsZhLG3 WFftJ35iyqNw7KLbz3bbwm3SDlDzqDEsYxtndKzgYhDQ+rhDx1FmyFLVqTaN2qv4ekp9 4Ogvx6vyBRER9XASP3wiowP/Z9ij3SMOqAaGCuE6WdilaF7eeQeC2yA3nXT1MpFfnbgm S4M/y3ygumPQo1IdCmS5eNnNqhtOuR8SBhsq9GwWx01PtSO+mptJ20oRYCTj9vPYtn68 sznTD4kuET9n0gWWmmPjE7OlptYe4rKvGvnQPjtm1zvcCdpWAIH6FNE6lWmpfTJZCxiH YQjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cowZ1cmLrnZZxcephacOQa4mjhuuVERSSt8ZL/UsOKw=; b=JMCsxWrL9dKABF1QmEac15XFTcdsuCv5h/jGvqtUfozKd6Lp7nfrPQvQzzCw7NSSOs 2YIMHFfS1+C7lmV7B6ulEEdlt/TYOLb1qaLwxhLTyJ+ZGZHXzDDCY+cA6AuMyeCCKUqG X7HXruTr8KQp7l4nIv1BjhSbk5X40r1RAWWetJ4XYzbJWcigWarqXlWROtbH7thQyPXn iRjyaOXEwlz6RRgxwphkcTDCMr+Jiea8whCb3ullZpuznuPKf5+Fspxc1IQhgTfOzwNB fvNeVTEWdM5iEUs7q5dXEsB6ffZt7LzYfqfJYp2tbcTZNTeQRVFK91S7eyaPaTT8hIoi oRSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q+P+dyif; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020aa7c407000000b004acc68a5878si3995695edq.274.2023.02.13.06.01.25; Mon, 13 Feb 2023 06:01:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q+P+dyif; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229521AbjBMNrN (ORCPT + 99 others); Mon, 13 Feb 2023 08:47:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbjBMNrM (ORCPT ); Mon, 13 Feb 2023 08:47:12 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D798B1ABD5 for ; Mon, 13 Feb 2023 05:46:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676295989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cowZ1cmLrnZZxcephacOQa4mjhuuVERSSt8ZL/UsOKw=; b=Q+P+dyiflwfVrbjJKVHlGuTN+JG/dWe3sP2i5ngTCKlZ8IP2CnYBtJkzzIR8LQg/JbSQy8 JgLsF7dVBa1Z1jGULzdEXmi6eWWVnX3czkj7wFhWoAkZwWKe0QO7aYvL+8GKaRaGuEbgpZ RVSvtt8y0ebybJ9sCn76rU7SH6d/jh4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-u6s-Mzk-MTWOuQY7_HuoaQ-1; Mon, 13 Feb 2023 08:46:27 -0500 X-MC-Unique: u6s-Mzk-MTWOuQY7_HuoaQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF5EE971086; Mon, 13 Feb 2023 13:46:25 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AE40492C3C; Mon, 13 Feb 2023 13:46:23 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard Subject: [PATCH 1/4] splice: Rename new splice functions Date: Mon, 13 Feb 2023 13:46:16 +0000 Message-Id: <20230213134619.2198965-2-dhowells@redhat.com> In-Reply-To: <20230213134619.2198965-1-dhowells@redhat.com> References: <20230213134619.2198965-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757724708969303950?= X-GMAIL-MSGID: =?utf-8?q?1757724708969303950?= Rename generic_file_buffered_splice_read() to filemap_splice_read(). Rename generic_file_direct_splice_read() to direct_splice_read(). Requested-by: Christoph Hellwig Signed-off-by: David Howells cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org Reviewed-by: Christoph Hellwig --- fs/splice.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 2717078949a2..91b9e2cb9e03 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -287,9 +287,9 @@ void splice_shrink_spd(struct splice_pipe_desc *spd) * Splice data from an O_DIRECT file into pages and then add them to the output * pipe. */ -static ssize_t generic_file_direct_splice_read(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, - size_t len, unsigned int flags) +static ssize_t direct_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) { struct iov_iter to; struct bio_vec *bv; @@ -417,10 +417,9 @@ static size_t splice_folio_into_pipe(struct pipe_inode_info *pipe, * Splice folios from the pagecache of a buffered (ie. non-O_DIRECT) file into * a pipe. */ -static ssize_t generic_file_buffered_splice_read(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, - size_t len, - unsigned int flags) +static ssize_t filemap_splice_read(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, + size_t len, unsigned int flags) { struct folio_batch fbatch; size_t total_spliced = 0, used, npages; @@ -529,8 +528,8 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, if (unlikely(!len)) return 0; if (in->f_flags & O_DIRECT) - return generic_file_direct_splice_read(in, ppos, pipe, len, flags); - return generic_file_buffered_splice_read(in, ppos, pipe, len, flags); + return direct_splice_read(in, ppos, pipe, len, flags); + return filemap_splice_read(in, ppos, pipe, len, flags); } EXPORT_SYMBOL(generic_file_splice_read);