iov_iter, net: Fold in csum_and_memcpy()

Fold csum_and_memcpy() in to its callers.

Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20230925120309.1731676-11-dhowells@redhat.com
cc: Alexander Viro <viro@zeniv.linux.org.uk>
cc: Jens Axboe <axboe@kernel.dk>
cc: Christoph Hellwig <hch@lst.de>
cc: Christian Brauner <christian@brauner.io>
cc: Matthew Wilcox <willy@infradead.org>
cc: Linus Torvalds <torvalds@linux-foundation.org>
cc: David Laight <David.Laight@ACULAB.COM>
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-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
cc: netdev@vger.kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d0656cc11c16a372879c3bc4d01392084cf25bfb..c81ef5d769538f225b1fd737ad9a8a5f3782dc7a 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3679,13 +3679,6 @@ static inline int __must_check skb_put_padto(struct sk_buff *skb, unsigned int l
        return __skb_put_padto(skb, len, true);
 }
 
-static inline __wsum csum_and_memcpy(void *to, const void *from, size_t len,
-                                    __wsum sum, size_t off)
-{
-       __wsum next = csum_partial_copy_nocheck(from, to, len);
-       return csum_block_add(sum, next, off);
-}
-
 struct csum_state {
        __wsum csum;
        size_t off;

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 37c89d0933b700e72ac6cc911f74e33af623b184..452620dd41e455774e74e5b8c3d54da015c343ac 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -732,8 +732,9 @@ size_t memcpy_to_iter_csum(void *iter_to, size_t progress,
                           size_t len, void *from, void *priv2)
 {
        __wsum *csum = priv2;
+       __wsum next = csum_partial_copy_nocheck(from, iter_to, len);
 
-       *csum = csum_and_memcpy(iter_to, from + progress, len, *csum, progress);
+       *csum = csum_block_add(*csum, next, progress);
        return 0;
 }
 

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5dbdfce2d05f04324d48933ddf474c0c12321131..3efed86321dbd548647c1f4f3229932d7b36a13d 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -6938,8 +6938,9 @@ size_t memcpy_from_iter_csum(void *iter_from, size_t progress,
                             size_t len, void *to, void *priv2)
 {
        __wsum *csum = priv2;
+       __wsum next = csum_partial_copy_nocheck(iter_from, to + progress, len);
 
-       *csum = csum_and_memcpy(to + progress, iter_from, len, *csum, progress);
+       *csum = csum_block_add(*csum, next, progress);
        return 0;
 }