iov_iter, net: Move hash_and_copy_to_iter() to net/

Move hash_and_copy_to_iter() to be with its only caller in networking code.

Signed-off-by: David Howells <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
cc: Alexander Viro <[email protected]>
cc: Jens Axboe <[email protected]>
cc: Christoph Hellwig <[email protected]>
cc: Christian Brauner <[email protected]>
cc: Matthew Wilcox <[email protected]>
cc: Linus Torvalds <[email protected]>
cc: David Laight <[email protected]>
cc: "David S. Miller" <[email protected]>
cc: Eric Dumazet <[email protected]>
cc: Jakub Kicinski <[email protected]>
cc: Paolo Abeni <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
Signed-off-by: Christian Brauner <[email protected]>

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 0a5426c97e024343fd5daec4270cab29b20bdc87..b6214cbf2a43f8e3820b0642ce1de2e082a4d86e 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -338,9 +338,6 @@ iov_iter_npages_cap(struct iov_iter *i, int maxpages, size_t max_bytes)
        return npages;
 }
 
-size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
-               struct iov_iter *i);
-
 struct iovec *iovec_from_user(const struct iovec __user *uvector,
                unsigned long nr_segs, unsigned long fast_segs,
                struct iovec *fast_iov, bool compat);

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 3f913616ce8847a581276b24c41c02c38f10b1c0..de7d11cf4c6356deccc37f180fa992dbe4d4c7b0 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-only
-#include <crypto/hash.h>
 #include <linux/export.h>
 #include <linux/bvec.h>
 #include <linux/fault-inject-usercopy.h>
@@ -1089,25 +1088,6 @@ ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i,
 }
 EXPORT_SYMBOL(iov_iter_get_pages_alloc2);
 
-size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
-               struct iov_iter *i)
-{
-#ifdef CONFIG_CRYPTO_HASH
-       struct ahash_request *hash = hashp;
-       struct scatterlist sg;
-       size_t copied;
-
-       copied = copy_to_iter(addr, bytes, i);
-       sg_init_one(&sg, addr, copied);
-       ahash_request_set_crypt(hash, &sg, NULL, copied);
-       crypto_ahash_update(hash);
-       return copied;
-#else
-       return 0;
-#endif
-}
-EXPORT_SYMBOL(hash_and_copy_to_iter);
-
 static int iov_npages(const struct iov_iter *i, int maxpages)
 {
        size_t skip = i->iov_offset, size = i->count;

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 722311eeee1812c263a44eeb8afe72f1c6acae04..103d46fa0eeb34af20b2d74b79f38e7424e25155 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -61,6 +61,7 @@
 #include <net/tcp_states.h>
 #include <trace/events/skb.h>
 #include <net/busy_poll.h>
+#include <crypto/hash.h>
 
 /*
  *     Is a socket 'connection oriented' ?
@@ -489,6 +490,24 @@ short_copy:
        return 0;
 }
 
+static size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,
+                                   struct iov_iter *i)
+{
+#ifdef CONFIG_CRYPTO_HASH
+       struct ahash_request *hash = hashp;
+       struct scatterlist sg;
+       size_t copied;
+
+       copied = copy_to_iter(addr, bytes, i);
+       sg_init_one(&sg, addr, copied);
+       ahash_request_set_crypt(hash, &sg, NULL, copied);
+       crypto_ahash_update(hash);
+       return copied;
+#else
+       return 0;
+#endif
+}
+
 /**
  *     skb_copy_and_hash_datagram_iter - Copy datagram to an iovec iterator
  *          and update a hash.