From nobody Thu Apr 2 23:53:34 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C29F33E8674 for ; Thu, 26 Mar 2026 10:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774522160; cv=none; b=jqXej9mmZjYO7ZZF8KMzUvPghRGlq7KFCEiQoFCPXRk6KUOfB6X4DcRyj29QcrbKKdjTxnmnuW9FgJuar9FHyP1Q54yx4PzUds5myVL7+tCMNmiSrTrctdiFpHQGJOMY89atDdhD2YjM8kmFnIbD50HPU7JfIjgsbJ7XyHRPwfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774522160; c=relaxed/simple; bh=SpZ0VaxBSEp+1ZOqzyTVy/Rn9WvmDJmje0biyVbE8tE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=drpmgm9jVqnXvaN7dNKV5tbFNpdp6kEvmeihX/uR6I3Zd0yxa3SC1A1hgZaFFknpL6zMpLKoqljXaOuXLn+hjso1Fn6xGXmpcUB9lCFcTT2ZNNwhta/eB6/qbVK5kdGS4BB371KUmFrfLFuLAZZlliG+Gn2Fey/9hPo+BwT793E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IT9vbJ+/; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IT9vbJ+/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774522158; 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=k6WIL/CPxi5yzw8jRwBaVYznmdI4kDLcX63WUAhouhQ=; b=IT9vbJ+/oEsynpdbd9m34YWE3r5EgqyZH3F4bpxQ/QiykypyhcUHEJoBE8ZitD2ZASWT2k ytHjPEEMpwRhDPwXKv/uq9gx1xA0TWQ8jD3ILGWpb7vFDxnAlEDzgvWsCxQZFjPhSn8FY6 wAb4GzmooqRGBl/wgUpoWDJRV4ygQT8= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-49IjD0dQNSmL208bogD7jQ-1; Thu, 26 Mar 2026 06:49:12 -0400 X-MC-Unique: 49IjD0dQNSmL208bogD7jQ-1 X-Mimecast-MFC-AGG-ID: 49IjD0dQNSmL208bogD7jQ_1774522150 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC199195608B; Thu, 26 Mar 2026 10:49:09 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.33.121]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1B5B619560B1; Thu, 26 Mar 2026 10:49:02 +0000 (UTC) From: David Howells To: Christian Brauner , Matthew Wilcox , Christoph Hellwig Cc: David Howells , Paulo Alcantara , Jens Axboe , Leon Romanovsky , Steve French , ChenXiaoSong , Marc Dionne , Eric Van Hensbergen , Dominique Martinet , Ilya Dryomov , Trond Myklebust , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Paulo Alcantara Subject: [PATCH 21/26] netfs: Remove netfs_extract_user_iter() Date: Thu, 26 Mar 2026 10:45:36 +0000 Message-ID: <20260326104544.509518-22-dhowells@redhat.com> In-Reply-To: <20260326104544.509518-1-dhowells@redhat.com> References: <20260326104544.509518-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" Remove netfs_extract_user_iter() as it has been replaced with netfs_extract_iter(). Signed-off-by: David Howells cc: Paulo Alcantara cc: Matthew Wilcox cc: Christoph Hellwig cc: Steve French cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/iterator.c | 96 ------------------------------------------- include/linux/netfs.h | 3 -- 2 files changed, 99 deletions(-) diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c index 581dbf650a19..442f893a0d65 100644 --- a/fs/netfs/iterator.c +++ b/fs/netfs/iterator.c @@ -137,102 +137,6 @@ ssize_t netfs_extract_iter(struct iov_iter *orig, siz= e_t orig_len, size_t max_se EXPORT_SYMBOL_GPL(netfs_extract_iter); =20 #if 0 -/** - * netfs_extract_user_iter - Extract the pages from a user iterator into a= bvec - * @orig: The original iterator - * @orig_len: The amount of iterator to copy - * @new: The iterator to be set up - * @extraction_flags: Flags to qualify the request - * - * Extract the page fragments from the given amount of the source iterator= and - * build up a second iterator that refers to all of those bits. This allo= ws - * the original iterator to be disposed of. - * - * @extraction_flags can have ITER_ALLOW_P2PDMA set to request peer-to-pee= r DMA be - * allowed on the pages extracted. - * - * On success, the number of elements in the bvec is returned, the original - * iterator will have been advanced by the amount extracted. - * - * The iov_iter_extract_mode() function should be used to query how cleanup - * should be performed. - */ -ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, - struct iov_iter *new, - iov_iter_extraction_t extraction_flags) -{ - struct bio_vec *bv =3D NULL; - struct page **pages; - unsigned int cur_npages; - unsigned int max_pages; - unsigned int npages =3D 0; - unsigned int i; - ssize_t ret; - size_t count =3D orig_len, offset, len; - size_t bv_size, pg_size; - - if (WARN_ON_ONCE(!iter_is_ubuf(orig) && !iter_is_iovec(orig))) - return -EIO; - - max_pages =3D iov_iter_npages(orig, INT_MAX); - bv_size =3D array_size(max_pages, sizeof(*bv)); - bv =3D kvmalloc(bv_size, GFP_KERNEL); - if (!bv) - return -ENOMEM; - - /* Put the page list at the end of the bvec list storage. bvec - * elements are larger than page pointers, so as long as we work - * 0->last, we should be fine. - */ - pg_size =3D array_size(max_pages, sizeof(*pages)); - pages =3D (void *)bv + bv_size - pg_size; - - while (count && npages < max_pages) { - ret =3D iov_iter_extract_pages(orig, &pages, count, - max_pages - npages, extraction_flags, - &offset); - if (unlikely(ret <=3D 0)) { - ret =3D ret ?: -EIO; - break; - } - - if (ret > count) { - pr_err("get_pages rc=3D%zd more than %zu\n", ret, count); - break; - } - - count -=3D ret; - ret +=3D offset; - cur_npages =3D DIV_ROUND_UP(ret, PAGE_SIZE); - - if (npages + cur_npages > max_pages) { - pr_err("Out of bvec array capacity (%u vs %u)\n", - npages + cur_npages, max_pages); - break; - } - - for (i =3D 0; i < cur_npages; i++) { - len =3D ret > PAGE_SIZE ? PAGE_SIZE : ret; - bvec_set_page(bv + npages + i, *pages++, len - offset, offset); - ret -=3D len; - offset =3D 0; - } - - npages +=3D cur_npages; - } - - if (ret < 0 && (ret =3D=3D -ENOMEM || npages =3D=3D 0)) { - for (i =3D 0; i < npages; i++) - unpin_user_page(bv[i].bv_page); - kvfree(bv); - return ret; - } - - iov_iter_bvec(new, orig->data_source, bv, npages, orig_len - count); - return npages; -} -EXPORT_SYMBOL_GPL(netfs_extract_user_iter); - /* * Select the span of a bvec iterator we're going to use. Limit it by bot= h maximum * size and maximum number of segments. Returns the size of the span in b= ytes. diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 9d8576a62868..65e39f9b0c10 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -448,9 +448,6 @@ void netfs_put_subrequest(struct netfs_io_subrequest *s= ubreq, ssize_t netfs_extract_iter(struct iov_iter *orig, size_t orig_len, size_t = max_segs, unsigned long long fpos, struct bvecq **_bvecq_head, iov_iter_extraction_t extraction_flags); -ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len, - struct iov_iter *new, - iov_iter_extraction_t extraction_flags); size_t netfs_limit_iter(const struct iov_iter *iter, size_t start_offset, size_t max_size, size_t max_segs); void netfs_prepare_write_failed(struct netfs_io_subrequest *subreq);