From patchwork Mon Feb 13 15:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13138595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C53EC636CC for ; Mon, 13 Feb 2023 15:33:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 390266B0073; Mon, 13 Feb 2023 10:33:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 318146B0075; Mon, 13 Feb 2023 10:33:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B9106B0078; Mon, 13 Feb 2023 10:33:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DE6DB6B0075 for ; Mon, 13 Feb 2023 10:33:17 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 83ADDAA9F2 for ; Mon, 13 Feb 2023 15:33:17 +0000 (UTC) X-FDA: 80462662434.21.8491549 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf07.hostedemail.com (Postfix) with ESMTP id CAB1B40021 for ; Mon, 13 Feb 2023 15:33:14 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="bKkDQG/P"; spf=pass (imf07.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676302394; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jiirWQEzjOJm38ClQocxHDg9OYUUCbqX/zh69yaIxOk=; b=wectWNAXvpPn2jHgY+QRhYQLTjYxJ3o7rBWfhNtvTc9YhtVY7rjIGzs/Bf8FsfZ4YVVknj x/seCBt21S2PnJ1MMgahIBX7Puhh1Fv/jzcYIAqYpV6BHbdeZpaRl/POIYVtdQ0SF/i3Xd Z2AVRhGyCQW8+JHJA8beTslDXBPVkkc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="bKkDQG/P"; spf=pass (imf07.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676302394; a=rsa-sha256; cv=none; b=JdX9q1BL3XMUMnebUC3TO2wju2UhRzQXsML4bfYkol1MZsEBmE3GU7uArXNsN/yiBqXTEx AnpUpiqsGvGWpCuguxIQSfv53PjeY/mpD9mfa75COPXQSTTeoGlGO2+cJbQKrPPvJ+af1A axFyIwo2ieI5JSvdpXsAPZj1weTEM20= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676302394; 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=jiirWQEzjOJm38ClQocxHDg9OYUUCbqX/zh69yaIxOk=; b=bKkDQG/PzppF28YOL69VGtZgW1XFhs3ZE3fPSbZYqpW+qlCUv+kXTeIe43dOUjKjbgGYRY rKyhyq/5PrRAF7mRhc0CW61O/pOc2ZhjXPDvFcGVQUaERmZogJkRV1Khvd60f5xVVgH7rU 63K3RqGMMCGEz+kq6fte+wHiGPHIrWM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-312-m02BLPiNNVOcc7akYvkMdA-1; Mon, 13 Feb 2023 10:33:09 -0500 X-MC-Unique: m02BLPiNNVOcc7akYvkMdA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 104AE1C04339; Mon, 13 Feb 2023 15:33:09 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1907918EC7; Mon, 13 Feb 2023 15:33:07 +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 v2 1/4] splice: Rename new splice functions Date: Mon, 13 Feb 2023 15:32:58 +0000 Message-Id: <20230213153301.2338806-2-dhowells@redhat.com> In-Reply-To: <20230213153301.2338806-1-dhowells@redhat.com> References: <20230213153301.2338806-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CAB1B40021 X-Stat-Signature: 5utyn9djn3s8jkcfyjkn7tw6yu7b6k4g X-HE-Tag: 1676302394-138013 X-HE-Meta: U2FsdGVkX18Jd31R8yQsD4kdHDs1e7UXxo4uLN1TO7YP+nUKulYSElA6o8AlXYqSCjiPBVjbcAqyY1DoL+d6Yy+LL7zO+AEaKC+lo4htt1Yj40IJdK2zj+IXnAr4LjmhdVMwNJl4oy96Dy8cfBDFxf8uEmtJ/HIYpF4jBXBbgnQq796hsKLPYIbmbinVh0p2+x2tlLkVovNZGWe5DEQeDszGKq2I0Qw+z1yRgy4fzCtbIhyU8oDwyZxukce5/09pmIP/jWcwu4lwTlDDQj9RuTaH4kSJZdl52kIqYPNt/gE0CdrImBhDXVG2AYL1pq5ph+wE2iDIWXlKRNTMzRD7SQxRz+077qOYL/fWdlR60DyVG3xfjlD1eVNV94CnViE5gCpwy88UD0tpe0zHrOLXXaKOxTSOzjqzYv2w2YVWZS5S9ewJbSwp1cZdHmFlQUTa442UhwTGvIaBNsGdmhZqF1KuC+zbSfy1wePGlxqyJBwt5G4ylzPB6+Bjk43eXB+wYxgMH6xQoOaIy91aIa70f+kgBFJBm/6xvbeI/XSNMdC/tLglPUaA1egLYwQSFaKA8OrTVeE2hjtWkp6MtaxguzWJf1uy86Qcbfpz8v4BkJAWZ+VnhuqOqr6UGZShyKHbxBql8KaNTdexED66qgUYki3kj96gWfr12TDfyUJ0i7YBW9l4dNf4vLhZ8d5owNapXIZcF+IeK+B8J3LyEtqM26hVRCt1vxzxDmoyLElF1VGHWkePZg79oF7Ym/X98vpiEyiJoMUH8gJX6TatlSabw5Kavhz8pkJAbyZpwiaVxrmhm1pea3GwrX2LCeRFWR7gPWi65fDX1mwMUnFgQF0y3gcc2b23535beGAwL2eL8qhalp8L3VPZ62WaxJeNWKGk04VWA1zo3l0EfEXJstmJ4ov+bhe3RQw3VV90VM2H7WSobUSQzINf4oYnuTzBvXJ7EdRoOc9F9SortuH+vCO HowFbZVa yWdp2e2yuERJf/FLeDMFuBcFI+mgYYW8aQ3XFaQlvgLay6XpsQgWTU6hTqR2eoGYvEhA/TsErDpnIuwmpP3mZTTE4q6SyU8j8ozgkYGMrV6x2NP5UXwpLk7bF7LdAkjoNNLb6Z77toeAoObbN1CZhMDInWDbXTiyrAnfK3j6sSrYXR0DDyWNe7hBqnzWgywzSKNPTcAYYUc0KMbfEJ5i9OayL7gUQ6cAKoV0iDqAtCJduAML5oUSUPOMP+5SYwiVZ8pIp7yXzlN80t8ibGdGhZB9eAsc3e5mHCoZEgbI4PimUk8/O4RTXcCA/C1KGUgVzwdlgc3y6tOyIlPvTWKB6ZcJqvAJRWfiB+STxN5NYCCkKhViH4zXrW31MLruBdC7fq+CrOB5g3ndo6T1oZTRHNdeCSvTsVfU4hHa1v1MJV3BtRAS3eH4rsBcQ8SdTBipTeqrD X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 Reviewed-by: 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: David Hildenbrand --- 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);