Drop the netfs_ prefix from netfs_extract_iter_to_sg()

Rename netfs_extract_iter_to_sg() and its auxiliary functions to drop the
netfs_ prefix.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: Steve French <sfrench@samba.org>
cc: Shyam Prasad N <nspmangalore@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: Jens Axboe <axboe@kernel.dk>
cc: Herbert Xu <herbert@gondor.apana.org.au>
cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-crypto@vger.kernel.org
cc: linux-cachefs@redhat.com
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: netdev@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c
index 8a4c866..f8eba3d 100644 (file)
--- a/fs/netfs/iterator.c
+++ b/fs/netfs/iterator.c
@@ -106,11 +106,11 @@ EXPORT_SYMBOL_GPL(netfs_extract_user_iter);
  * Extract and pin a list of up to sg_max pages from UBUF- or IOVEC-class
  * iterators, and add them to the scatterlist.
  */
-static ssize_t netfs_extract_user_to_sg(struct iov_iter *iter,
-                                       ssize_t maxsize,
-                                       struct sg_table *sgtable,
-                                       unsigned int sg_max,
-                                       iov_iter_extraction_t extraction_flags)
+static ssize_t extract_user_to_sg(struct iov_iter *iter,
+                                 ssize_t maxsize,
+                                 struct sg_table *sgtable,
+                                 unsigned int sg_max,
+                                 iov_iter_extraction_t extraction_flags)
 {
        struct scatterlist *sg = sgtable->sgl + sgtable->nents;
        struct page **pages;
@@ -159,11 +159,11 @@ failed:
  * Extract up to sg_max pages from a BVEC-type iterator and add them to the
  * scatterlist.  The pages are not pinned.
  */
-static ssize_t netfs_extract_bvec_to_sg(struct iov_iter *iter,
-                                       ssize_t maxsize,
-                                       struct sg_table *sgtable,
-                                       unsigned int sg_max,
-                                       iov_iter_extraction_t extraction_flags)
+static ssize_t extract_bvec_to_sg(struct iov_iter *iter,
+                                 ssize_t maxsize,
+                                 struct sg_table *sgtable,
+                                 unsigned int sg_max,
+                                 iov_iter_extraction_t extraction_flags)
 {
        const struct bio_vec *bv = iter->bvec;
        struct scatterlist *sg = sgtable->sgl + sgtable->nents;
@@ -205,11 +205,11 @@ static ssize_t netfs_extract_bvec_to_sg(struct iov_iter *iter,
  * scatterlist.  This can deal with vmalloc'd buffers as well as kmalloc'd or
  * static buffers.  The pages are not pinned.
  */
-static ssize_t netfs_extract_kvec_to_sg(struct iov_iter *iter,
-                                       ssize_t maxsize,
-                                       struct sg_table *sgtable,
-                                       unsigned int sg_max,
-                                       iov_iter_extraction_t extraction_flags)
+static ssize_t extract_kvec_to_sg(struct iov_iter *iter,
+                                 ssize_t maxsize,
+                                 struct sg_table *sgtable,
+                                 unsigned int sg_max,
+                                 iov_iter_extraction_t extraction_flags)
 {
        const struct kvec *kv = iter->kvec;
        struct scatterlist *sg = sgtable->sgl + sgtable->nents;
@@ -266,11 +266,11 @@ static ssize_t netfs_extract_kvec_to_sg(struct iov_iter *iter,
  * Extract up to sg_max folios from an XARRAY-type iterator and add them to
  * the scatterlist.  The pages are not pinned.
  */
-static ssize_t netfs_extract_xarray_to_sg(struct iov_iter *iter,
-                                         ssize_t maxsize,
-                                         struct sg_table *sgtable,
-                                         unsigned int sg_max,
-                                         iov_iter_extraction_t extraction_flags)
+static ssize_t extract_xarray_to_sg(struct iov_iter *iter,
+                                   ssize_t maxsize,
+                                   struct sg_table *sgtable,
+                                   unsigned int sg_max,
+                                   iov_iter_extraction_t extraction_flags)
 {
        struct scatterlist *sg = sgtable->sgl + sgtable->nents;
        struct xarray *xa = iter->xarray;
@@ -312,7 +312,7 @@ static ssize_t netfs_extract_xarray_to_sg(struct iov_iter *iter,
 }
 
 /**
- * netfs_extract_iter_to_sg - Extract pages from an iterator and add ot an sglist
+ * extract_iter_to_sg - Extract pages from an iterator and add ot an sglist
  * @iter: The iterator to extract from
  * @maxsize: The amount of iterator to copy
  * @sgtable: The scatterlist table to fill in
@@ -339,9 +339,9 @@ static ssize_t netfs_extract_xarray_to_sg(struct iov_iter *iter,
  * The iov_iter_extract_mode() function should be used to query how cleanup
  * should be performed.
  */
-ssize_t netfs_extract_iter_to_sg(struct iov_iter *iter, size_t maxsize,
-                                struct sg_table *sgtable, unsigned int sg_max,
-                                iov_iter_extraction_t extraction_flags)
+ssize_t extract_iter_to_sg(struct iov_iter *iter, size_t maxsize,
+                          struct sg_table *sgtable, unsigned int sg_max,
+                          iov_iter_extraction_t extraction_flags)
 {
        if (maxsize == 0)
                return 0;
@@ -349,21 +349,21 @@ ssize_t netfs_extract_iter_to_sg(struct iov_iter *iter, size_t maxsize,
        switch (iov_iter_type(iter)) {
        case ITER_UBUF:
        case ITER_IOVEC:
-               return netfs_extract_user_to_sg(iter, maxsize, sgtable, sg_max,
-                                               extraction_flags);
+               return extract_user_to_sg(iter, maxsize, sgtable, sg_max,
+                                         extraction_flags);
        case ITER_BVEC:
-               return netfs_extract_bvec_to_sg(iter, maxsize, sgtable, sg_max,
-                                               extraction_flags);
+               return extract_bvec_to_sg(iter, maxsize, sgtable, sg_max,
+                                         extraction_flags);
        case ITER_KVEC:
-               return netfs_extract_kvec_to_sg(iter, maxsize, sgtable, sg_max,
-                                               extraction_flags);
+               return extract_kvec_to_sg(iter, maxsize, sgtable, sg_max,
+                                         extraction_flags);
        case ITER_XARRAY:
-               return netfs_extract_xarray_to_sg(iter, maxsize, sgtable, sg_max,
-                                                 extraction_flags);
+               return extract_xarray_to_sg(iter, maxsize, sgtable, sg_max,
+                                           extraction_flags);
        default:
                pr_err("%s(%u) unsupported\n", __func__, iov_iter_type(iter));
                WARN_ON_ONCE(1);
                return -EIO;
        }
 }
-EXPORT_SYMBOL_GPL(netfs_extract_iter_to_sg);
+EXPORT_SYMBOL_GPL(extract_iter_to_sg);

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 6e3be58..38d2265 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -4333,8 +4333,8 @@ static void *smb2_get_aead_req(struct crypto_aead *tfm, struct smb_rqst *rqst,
                }
                sgtable.orig_nents = sgtable.nents;
 
-               rc = netfs_extract_iter_to_sg(iter, count, &sgtable,
-                                             num_sgs - sgtable.nents, 0);
+               rc = extract_iter_to_sg(iter, count, &sgtable,
+                                       num_sgs - sgtable.nents, 0);
                iov_iter_revert(iter, rc);
                sgtable.orig_nents = sgtable.nents;
        }

diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index 0362ebd..223e17c 100644 (file)
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -2227,7 +2227,7 @@ static int smbd_iter_to_mr(struct smbd_connection *info,
 
        memset(sgt->sgl, 0, max_sg * sizeof(struct scatterlist));
 
-       ret = netfs_extract_iter_to_sg(iter, iov_iter_count(iter), sgt, max_sg, 0);
+       ret = extract_iter_to_sg(iter, iov_iter_count(iter), sgt, max_sg, 0);
        WARN_ON(ret < 0);
        if (sgt->nents > 0)
                sg_mark_end(&sgt->sgl[sgt->nents - 1]);

diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index a1f3522..55e201c 100644 (file)
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -301,9 +301,9 @@ 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 sg_table;
-ssize_t netfs_extract_iter_to_sg(struct iov_iter *iter, size_t len,
-                                struct sg_table *sgtable, unsigned int sg_max,
-                                iov_iter_extraction_t extraction_flags);
+ssize_t extract_iter_to_sg(struct iov_iter *iter, size_t len,
+                          struct sg_table *sgtable, unsigned int sg_max,
+                          iov_iter_extraction_t extraction_flags);
 
 /**
  * netfs_inode - Get the netfs inode context from the inode