[PATCH mptcp-next v6 05/10] mptcp: remove redundant orig_offset in carve_data_frag
Geliang Tang <[email protected]> Thu, 16 Jul 2026 15:50:44 +0800
| Newsgroups | dev.linux.lists.mptcp |
|---|---|
| Message-ID | <26a440ab536462e9618b4f10f86197657c712608.1784188064.git.tanggeliang@kylinos.cn> |
From: Geliang Tang <[email protected]> mptcp_carve_data_frag() already receives struct page_frag via its 'pfrag' parameter, making the separate 'orig_offset' parameter redundant since it merely duplicates pfrag->offset. Simplify the function signature by removing this unnecessary parameter and directly accessing the offset from struct pfrag internally. Signed-off-by: Geliang Tang <[email protected]> --- net/mptcp/protocol.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7ad3a4a09e3b..85bbcb16c87e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1234,12 +1234,13 @@ static bool mptcp_page_frag_refill(struct sock *sk, struct page_frag *pfrag) } static struct mptcp_data_frag * -mptcp_carve_data_frag(const struct mptcp_sock *msk, struct page_frag *pfrag, - int orig_offset) +mptcp_carve_data_frag(const struct mptcp_sock *msk, struct page_frag *pfrag) { - int offset = ALIGN(orig_offset, sizeof(u64)); + int orig_offset = pfrag->offset; struct mptcp_data_frag *dfrag; + int offset; + offset = ALIGN(orig_offset, sizeof(u64)); dfrag = (struct mptcp_data_frag *)(page_to_virt(pfrag->page) + offset); dfrag->data_len = 0; dfrag->data_seq = msk->write_seq; @@ -2031,7 +2032,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (!mptcp_page_frag_refill(sk, pfrag)) goto wait_for_memory; - dfrag = mptcp_carve_data_frag(msk, pfrag, pfrag->offset); + dfrag = mptcp_carve_data_frag(msk, pfrag); frag_truesize = dfrag->overhead; } -- 2.53.0