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 - fs/smb/client/smbdirect.c | 1 - include/linux/netfs.h | 4 -- 5 files changed, 105 deletions(-) diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index ef9066659438..ebe8cfd050a9 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 ab142cbaad35..a19724389147 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 76baf21404df..7223a8deaa58 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/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c index 682df21c5ad2..8ffb5d1eba62 100644 --- a/fs/smb/client/smbdirect.c +++ b/fs/smb/client/smbdirect.c @@ -6,7 +6,6 @@ */ #include #include -#include #define __SMBDIRECT_SOCKET_DISCONNECT(__sc) smbd_disconnect_rdma_connection(__sc) #include "../common/smbdirect/smbdirect_pdu.h" #include "smbdirect.h" diff --git a/include/linux/netfs.h b/include/linux/netfs.h index a48f03e85b6a..e49cb8ffb811 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -467,10 +467,6 @@ 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); void dump_bvecq(const struct bvecq *bq); struct bvecq *netfs_alloc_bvecq(size_t nr_slots, gfp_t gfp); struct bvecq *netfs_alloc_bvecq_buffer(size_t size, unsigned int pre_slots, gfp_t gfp);