From patchwork Mon Jan 16 23:08:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 44356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1447208wrn; Mon, 16 Jan 2023 15:12:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXtjiL3LDx0eELhV5kYZQg4k1pN9xsKQr9FGXCTMWC6+K3CPfQ900qTvtbCGaNKCfTK2GFBH X-Received: by 2002:a17:906:edac:b0:844:1d1d:f7 with SMTP id sa12-20020a170906edac00b008441d1d00f7mr666665ejb.23.1673910723493; Mon, 16 Jan 2023 15:12:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673910723; cv=none; d=google.com; s=arc-20160816; b=Hpck/m+dCCHfg8gTnQgnqnWuHvxQkL7Xbp3qd17XdSCE//1S2Cyyw6/nKl7QlhdKaS WfwHtrnpZnHu+l26qzL0mwUsIR448JM/0mFyjqJNh4QdENcbc+g8DoWVl9xvlNhLaWQT 3tAYJ+H/+BCEvmcMR/l+rBcOeHl2mN9NCpnhYpxqZ91dBfmo1b0PhSBE5s1AD9fv1qQy KCBvd5FHotXeR6yIr5Ec3ANWfsS3bRqswE1UBUkFyMPW8A6TgG4VeWoi1jJc0SMPMaiG DmbdxguYoDgTaQoWh+rJ4kHPSLGi3ywEzqFtrNMHdoirokLQXLi4dYXPlePzMVLE476T b0Dg== 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 :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=4dAIPKunUAzbkWNJ87wOuiKX6GyF+tsszNSftx0o+4s=; b=gUY8VEeMievshyY1EZB+fBMVhN+nBgAPZj4AatcA58Y4jQ/p/JNc7hNfj7iGMcnBP3 VcfCXj/5V9W/c3VPxxVIPbEK+9ypsNqivC3JMAVAqDoITkf0CkACkHRhsdFMGZXeBxvw Us6tqneyLbzXCntK2CVixIlWRinIpd6rEsSdwXPRVFtHHL99/+ihV71ESDsGZKSrnGax Qr/aet9eZ6azDtyji0sZ9AfMt8olZMeQRoWDOAevhoD7tuBTgyg5jPkjSguLnI/8NS6U oR/rBVkZpStvF5LMBx/ZQ0M2JCwd9JQWJCfLO6EacOFEsL/cTfxKueqbGztvrXkFulif UFJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HFiUfl90; 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 cw18-20020a170906479200b008641d4f0500si18231856ejc.301.2023.01.16.15.11.40; Mon, 16 Jan 2023 15:12:03 -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=HFiUfl90; 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 S234743AbjAPXK3 (ORCPT + 99 others); Mon, 16 Jan 2023 18:10:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234921AbjAPXJ1 (ORCPT ); Mon, 16 Jan 2023 18:09:27 -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 7EB4C15578 for ; Mon, 16 Jan 2023 15:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673910519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4dAIPKunUAzbkWNJ87wOuiKX6GyF+tsszNSftx0o+4s=; b=HFiUfl90+bD2R3jW8acQ4gDPk4NcjhUSJeqkXwvCbVv9vL48IfDFTDtwwnaa2UENxqGG/v 21SiwbYZfMwEJ9SzH96Nz0uiila21spRxGnO6iFSkzOVBuoP5nICwRfk/3HS8VEOK39K4n t/oKmvdgVUonnQlwYwmyCM3Ynr2HOmM= 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-39-CDItCd_iNCaYGYyZBePHvw-1; Mon, 16 Jan 2023 18:08:33 -0500 X-MC-Unique: CDItCd_iNCaYGYyZBePHvw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ECD041C0432A; Mon, 16 Jan 2023 23:08:32 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE10E2166B26; Mon, 16 Jan 2023 23:08:31 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH v6 04/34] iov_iter: Remove iov_iter_get_pages2/pages_alloc2() From: David Howells To: Al Viro Cc: dhowells@redhat.com, Christoph Hellwig , Matthew Wilcox , Jens Axboe , Jan Kara , Jeff Layton , Logan Gunthorpe , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 16 Jan 2023 23:08:31 +0000 Message-ID: <167391051122.2311931.14824492646435673046.stgit@warthog.procyon.org.uk> In-Reply-To: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> References: <167391047703.2311931.8115712773222260073.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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=unavailable 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?1755222610623743999?= X-GMAIL-MSGID: =?utf-8?q?1755222610623743999?= There are now no users of iov_iter_get_pages2() and iov_iter_get_pages_alloc2(), so remove them. Signed-off-by: David Howells --- include/linux/uio.h | 4 ---- lib/iov_iter.c | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index 6f4dfa96324d..365e26c405f2 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -248,13 +248,9 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray * ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start, unsigned gup_flags); -ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, - size_t maxsize, unsigned maxpages, size_t *start); ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages, size_t maxsize, size_t *start, unsigned gup_flags); -ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, struct page ***pages, - size_t maxsize, size_t *start); int iov_iter_npages(const struct iov_iter *i, int maxpages); void iov_iter_restore(struct iov_iter *i, struct iov_iter_state *state); diff --git a/lib/iov_iter.c b/lib/iov_iter.c index f53583836009..ca89ffa9d6e1 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1511,13 +1511,6 @@ ssize_t iov_iter_get_pages(struct iov_iter *i, } EXPORT_SYMBOL_GPL(iov_iter_get_pages); -ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, - size_t maxsize, unsigned maxpages, size_t *start) -{ - return iov_iter_get_pages(i, pages, maxsize, maxpages, start, 0); -} -EXPORT_SYMBOL(iov_iter_get_pages2); - ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages, size_t maxsize, size_t *start, unsigned gup_flags) @@ -1536,13 +1529,6 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, } EXPORT_SYMBOL_GPL(iov_iter_get_pages_alloc); -ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, - struct page ***pages, size_t maxsize, size_t *start) -{ - return iov_iter_get_pages_alloc(i, pages, maxsize, start, 0); -} -EXPORT_SYMBOL(iov_iter_get_pages_alloc2); - size_t csum_and_copy_from_iter(void *addr, size_t bytes, __wsum *csum, struct iov_iter *i) {