From mboxrd@z Thu Jan 1 00:00:00 1970 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 365643B2FCD for ; Mon, 18 May 2026 22:32:28 +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=1779143550; cv=none; b=YmKTb+SiYZUFsxv67D4xY9wCOaFikV07ATj9w7rhZJgQnk+FZEolgOAN/ekESJJaQkbc79hTXZDkFAlXtO63tpoHw+3oMSF/k6mgva3ywiAIHOyma8NVMD8shjlR1x0UiEFLr4T9680s0Y3qqrrHYfOxbH1mwCD9kM+aHzTlumI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779143550; c=relaxed/simple; bh=K9C0fom2VN7NJca6HBsiNjrk7q6GwJ1tesue3bEeH3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m/85Sd/TUDcZZvfsfFcW0YLWLIj7bsMVbV1pHhs0J+0C9FWD5G8yGVJJarX+wjX7qWezixrhsXNIA1KodS7I+UiQpt5kUwBYJPtYgo1Z0MUHRT09T0WGp7+4P6LMEYvqG7REJgHfUyoalb1bDPifEKsDEhwV3vRIRNni3LxZAVI= 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=bKSLgYaE; 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="bKSLgYaE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779143547; 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=2GdqhlTTyPpgPeJEKArfYZH3i6xjRZ8jMxV7l6pWvfU=; b=bKSLgYaE27E52Y9RZkGj3Tavu+dGAEQ6+ipTyOJ00ynHZh1GGu5g2A45A356G4niWcEZ7k CgHBdnoSzQRkdjNjOqB6oM8ohplxFw5/zNu0EARHw6gg1U/9KVJ7/+NwClRCSQaItFV454 DSoYpmeVHScyucQgR5bIVwqkVfe0lIg= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-60-y65m8WQnNSWCwrjzx4UfHA-1; Mon, 18 May 2026 18:32:23 -0400 X-MC-Unique: y65m8WQnNSWCwrjzx4UfHA-1 X-Mimecast-MFC-AGG-ID: y65m8WQnNSWCwrjzx4UfHA_1779143540 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 79485180047F; Mon, 18 May 2026 22:32:20 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.48.33]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 39AEC1956053; Mon, 18 May 2026 22:32:13 +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 Subject: [PATCH v2 15/21] netfs: Remove netfs_alloc/free_folioq_buffer() Date: Mon, 18 May 2026 23:29:47 +0100 Message-ID: <20260518222959.488126-16-dhowells@redhat.com> In-Reply-To: <20260518222959.488126-1-dhowells@redhat.com> References: <20260518222959.488126-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Remove netfs_alloc/free_folioq_buffer() as these have been replaced with netfs_alloc/free_bvecq_buffer(). 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/afs/dir_edit.c | 1 - fs/netfs/misc.c | 98 ----------------------------------------- fs/smb/client/smb2ops.c | 1 - include/linux/netfs.h | 6 --- 4 files changed, 106 deletions(-) diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index fc918b3d8f68..2c655cd6a8e4 100644 --- a/fs/afs/dir_edit.c +++ b/fs/afs/dir_edit.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "internal.h" #include "xdr_fs.h" diff --git a/fs/netfs/misc.c b/fs/netfs/misc.c index ee67a0681784..8fc4e5ef2152 100644 --- a/fs/netfs/misc.c +++ b/fs/netfs/misc.c @@ -8,104 +8,6 @@ #include #include "internal.h" -#if 0 -/** - * netfs_alloc_folioq_buffer - Allocate buffer space into a folio queue - * @mapping: Address space to set on the folio (or NULL). - * @_buffer: Pointer to the folio queue to add to (may point to a NULL; updated). - * @_cur_size: Current size of the buffer (updated). - * @size: Target size of the buffer. - * @gfp: The allocation constraints. - */ -int netfs_alloc_folioq_buffer(struct address_space *mapping, - struct folio_queue **_buffer, - size_t *_cur_size, ssize_t size, gfp_t gfp) -{ - struct folio_queue *tail = *_buffer, *p; - - size = round_up(size, PAGE_SIZE); - if (*_cur_size >= size) - return 0; - - if (tail) - while (tail->next) - tail = tail->next; - - do { - struct folio *folio; - int order = 0, slot; - - if (!tail || folioq_full(tail)) { - p = netfs_folioq_alloc(0, GFP_NOFS, netfs_trace_folioq_alloc_buffer); - if (!p) - return -ENOMEM; - if (tail) { - tail->next = p; - p->prev = tail; - } else { - *_buffer = p; - } - tail = p; - } - - if (size - *_cur_size > PAGE_SIZE) - order = umin(ilog2(size - *_cur_size) - PAGE_SHIFT, - MAX_PAGECACHE_ORDER); - - folio = folio_alloc(gfp, order); - if (!folio && order > 0) - folio = folio_alloc(gfp, 0); - if (!folio) - return -ENOMEM; - - folio->mapping = mapping; - folio->index = *_cur_size / PAGE_SIZE; - trace_netfs_folio(folio, netfs_folio_trace_alloc_buffer); - slot = folioq_append_mark(tail, folio); - *_cur_size += folioq_folio_size(tail, slot); - } while (*_cur_size < size); - - return 0; -} -EXPORT_SYMBOL(netfs_alloc_folioq_buffer); - -/** - * netfs_free_folioq_buffer - Free a folio queue. - * @fq: The start of the folio queue to free - * - * Free up a chain of folio_queues and, if marked, the marked folios they point - * to. - */ -void netfs_free_folioq_buffer(struct folio_queue *fq) -{ - struct folio_queue *next; - struct folio_batch fbatch; - - folio_batch_init(&fbatch); - - for (; fq; fq = next) { - for (int slot = 0; slot < folioq_count(fq); slot++) { - struct folio *folio = folioq_folio(fq, slot); - - if (!folio || - !folioq_is_marked(fq, slot)) - continue; - - trace_netfs_folio(folio, netfs_folio_trace_put); - if (folio_batch_add(&fbatch, folio)) - folio_batch_release(&fbatch); - } - - netfs_stat_d(&netfs_n_folioq); - next = fq->next; - kfree(fq); - } - - folio_batch_release(&fbatch); -} -EXPORT_SYMBOL(netfs_free_folioq_buffer); -#endif - /** * netfs_dirty_folio - Mark folio dirty and pin a cache object for writeback * @mapping: The mapping the folio belongs to. diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 230102f2e411..9199baa5c315 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include "cifsfs.h" #include "cifsglob.h" diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 15a1c3026733..9e551e09054f 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -479,12 +479,6 @@ void netfs_end_io_write(struct inode *inode); int netfs_start_io_direct(struct inode *inode); void netfs_end_io_direct(struct inode *inode); -/* Buffer wrangling helpers API. */ -int netfs_alloc_folioq_buffer(struct address_space *mapping, - struct folio_queue **_buffer, - size_t *_cur_size, ssize_t size, gfp_t gfp); -void netfs_free_folioq_buffer(struct folio_queue *fq); - /** * netfs_inode - Get the netfs inode context from the inode * @inode: The inode to query