net: splice: Drop unused @pipe

Since commit 41c73a0d44c9 ("net: speedup skb_splice_bits()"),
__splice_segment() and spd_fill_page() do not use the @pipe argument. Drop
it.

While adapting the callers, move one line to enforce reverse xmas tree
order.

No functional change intended.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20250702-splice-drop-unused-v3-1-55f68b60d2b7@rbox.co
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index d6420b74ea9c6a9c53a7c16634cce82a1cd1bbd3..ae0f1aae3c91d914020c64e0703732b9c6cd8511 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3060,10 +3060,8 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd,
 /*
  * Fill page/offset/length into spd, if it can hold more pages.
  */
-static bool spd_fill_page(struct splice_pipe_desc *spd,
-                         struct pipe_inode_info *pipe, struct page *page,
-                         unsigned int *len, unsigned int offset,
-                         bool linear,
+static bool spd_fill_page(struct splice_pipe_desc *spd, struct page *page,
+                         unsigned int *len, unsigned int offset, bool linear,
                          struct sock *sk)
 {
        if (unlikely(spd->nr_pages == MAX_SKB_FRAGS))
@@ -3091,8 +3089,7 @@ static bool __splice_segment(struct page *page, unsigned int poff,
                             unsigned int plen, unsigned int *off,
                             unsigned int *len,
                             struct splice_pipe_desc *spd, bool linear,
-                            struct sock *sk,
-                            struct pipe_inode_info *pipe)
+                            struct sock *sk)
 {
        if (!*len)
                return true;
@@ -3111,8 +3108,7 @@ static bool __splice_segment(struct page *page, unsigned int poff,
        do {
                unsigned int flen = min(*len, plen);
 
-               if (spd_fill_page(spd, pipe, page, &flen, poff,
-                                 linear, sk))
+               if (spd_fill_page(spd, page, &flen, poff, linear, sk))
                        return true;
                poff += flen;
                plen -= flen;
@@ -3130,8 +3126,8 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
                              unsigned int *offset, unsigned int *len,
                              struct splice_pipe_desc *spd, struct sock *sk)
 {
-       int seg;
        struct sk_buff *iter;
+       int seg;
 
        /* map the linear part :
         * If skb->head_frag is set, this 'linear' part is backed by a
@@ -3143,7 +3139,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
                             skb_headlen(skb),
                             offset, len, spd,
                             skb_head_is_locked(skb),
-                            sk, pipe))
+                            sk))
                return true;
 
        /*
@@ -3160,7 +3156,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
 
                if (__splice_segment(skb_frag_page(f),
                                     skb_frag_off(f), skb_frag_size(f),
-                                    offset, len, spd, false, sk, pipe))
+                                    offset, len, spd, false, sk))
                        return true;
        }