From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF330296178; Thu, 26 Jun 2025 08:34:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926864; cv=none; b=XTwo0H+M+0eXrH3aT4ngyQnVFSegpDmKMV7fXQ2E9U0OMuyFs3xSvgpLtAQzrXwVkSIfUPrEG96jjqV4XqcVk8OwwWwsBQBubmFxN3gkp4p9h7W44PnyxbXIkBD0BEgn1g/9B5JZwK9ghly8EVhikqOOHW/iprYBg2LLnMojWdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926864; c=relaxed/simple; bh=oM4yrZkbORnoOSwRB4HpJVAkPbjUun1Zygh9bwacyAE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T+1WFmrqqgxnBakPMNPpl/2bqDpcEoxPOxjFjFvQ2vZALh+w+YyeqTtfTjTevBIzLz6u+iLop9viELN95LS9eODdtc2xZyvEmgdyizlbzGZUArdGlZl+3rJDhjXrzCWqeSky4cz4N3Fd5im4ERYq7CkXKWx2ElnDlldZqEDDius= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=J3fCOu0w; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="J3fCOu0w" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uUi3j-00GcDe-Ts; Thu, 26 Jun 2025 10:34:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=TiexokGz9ho1xFBdymbZXth9LTl3BCafcUWpixfwpJ8=; b=J3fCOu0wlqdEm0BwUrVEAQTMKT FVAtjl0uAAkGKoIJ8Dlgw3bM5X1M6orTODQdV6vi6XKhZKniIgyT6YGjJqKnFE/3w+ggF5+H+ZoXH Q/dOQD0Eka57vSlRgIqHvGjg2KM+mkfyexmzs5OeZas6U6LdENMvhNiZDrW9EMVGEaGbbGUsguti5 Gv0PfhwU5t4orWocSsBaaWzVnyvJFxwxY+msOEMohEI9tDYczpI3ttMM/OdyqMGxhCsnKvJ7EDvsH taLT0Z+acIcfUCCxQKUKZOvP8SIQnUdLPGRZVjxaVNtLBAKcdcDOAeS2XDPyRB2hb/DJOf/uWmhTq dCeokVsw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3j-0004qF-Hs; Thu, 26 Jun 2025 10:34:15 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uUi3M-009Fh5-9H; Thu, 26 Jun 2025 10:33:52 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:35 +0200 Subject: [PATCH net-next v2 2/9] net: splice: Drop unused @flags Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250626-splice-drop-unused-v2-2-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since commit 79fddc4efd5d ("new helper: add_to_pipe()") which removed `spd->flags` check in splice_to_pipe(), skb_splice_bits() does not use the @flags argument. Remove it and adapt callers. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- include/linux/skbuff.h | 3 +-- net/core/skbuff.c | 3 +-- net/ipv4/tcp.c | 2 +- net/kcm/kcmsock.c | 2 +- net/tls/tls_sw.c | 2 +- net/unix/af_unix.c | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 4f6dcb37bae8ada524a1e8f8de44c259cfac695b..5b6f460c69b277124e788cfa0599486522e62c9c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -4157,8 +4157,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len); __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to, int len); int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset, - struct pipe_inode_info *pipe, unsigned int len, - unsigned int flags); + struct pipe_inode_info *pipe, unsigned int len); int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset, int len); int skb_send_sock_locked_with_flags(struct sock *sk, struct sk_buff *skb, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ae0f1aae3c91d914020c64e0703732b9c6cd8511..02ead44a82bb71d30d294a6931943d07cf7c7177 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3181,8 +3181,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe, * the fragments, and the frag list. */ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset, - struct pipe_inode_info *pipe, unsigned int tlen, - unsigned int flags) + struct pipe_inode_info *pipe, unsigned int tlen) { struct partial_page partial[MAX_SKB_FRAGS]; struct page *pages[MAX_SKB_FRAGS]; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a3c99246d2ed32ba45849b56830bf128e265763..46997793d87ab40dcd1e1dd041e4641e287e1b7e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -766,7 +766,7 @@ static int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, int ret; ret = skb_splice_bits(skb, skb->sk, offset, tss->pipe, - min(rd_desc->count, len), tss->flags); + min(rd_desc->count, len)); if (ret > 0) rd_desc->count -= ret; return ret; diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 24aec295a51cf737912f1aefe81556bd9f23331e..8140c9c9cc2cb7aa71eaceab8a019d882bc454aa 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1043,7 +1043,7 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos, if (len > stm->full_len) len = stm->full_len; - copied = skb_splice_bits(skb, sk, stm->offset, pipe, len, flags); + copied = skb_splice_bits(skb, sk, stm->offset, pipe, len); if (copied < 0) { err = copied; goto err_out; diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index fc88e34b7f33fefed8aa3c26e1f6eed07cd20853..5bca6cfce749aa9fd64da764b2a0d6a4c936efac 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2266,7 +2266,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, } chunk = min_t(unsigned int, rxm->full_len, len); - copied = skb_splice_bits(skb, sk, rxm->offset, pipe, chunk, flags); + copied = skb_splice_bits(skb, sk, rxm->offset, pipe, chunk); if (copied < 0) goto splice_requeue; diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 1e320f89168d1cd4b5e8fa56565cce9f008ab857..235319a045a1238cf27791dfefa9e61b4a593551 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -3070,7 +3070,7 @@ static int unix_stream_splice_actor(struct sk_buff *skb, { return skb_splice_bits(skb, state->socket->sk, UNIXCB(skb).consumed + skip, - state->pipe, chunk, state->splice_flags); + state->pipe, chunk); } static ssize_t unix_stream_splice_read(struct socket *sock, loff_t *ppos, -- 2.49.0