diff mbox series

[mptcp-next,v1,2/2] mptcp: pm: use pm variable instead of msk->pm

Message ID b3fc56c8fefef00d42c064da81ce13b138d43103.1741072099.git.tanggeliang@kylinos.cn (mailing list archive)
State Accepted, archived
Commit 84e8a48a2088418b198306484a4b5f5287c9c05c
Delegated to: Matthieu Baerts
Headers show
Series pm misc cleanups | expand

Checks

Context Check Description
matttbe/build success Build and static analysis OK
matttbe/checkpatch success total: 0 errors, 0 warnings, 0 checks, 24 lines checked
matttbe/shellcheck success MPTCP selftests files have not been modified
matttbe/KVM_Validation__normal success Success! ✅
matttbe/KVM_Validation__debug success Success! ✅
matttbe/KVM_Validation__btf-normal__only_bpftest_all_ success Success! ✅
matttbe/KVM_Validation__btf-debug__only_bpftest_all_ success Success! ✅

Commit Message

Geliang Tang March 4, 2025, 7:16 a.m. UTC 
From: Geliang Tang <tanggeliang@kylinos.cn>

The variable "pm" has been defined in mptcp_pm_fully_established()
and mptcp_pm_data_reset() as "sk->pm", so use "pm" directly instead
of using "sk->pm".

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Geliang Tang March 5, 2025, 1:01 a.m. UTC | #1 
Hi Matt,

On Tue, 2025-03-04 at 15:16 +0800, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> The variable "pm" has been defined in mptcp_pm_fully_established()
> and mptcp_pm_data_reset() as "sk->pm", so use "pm" directly instead
> of using "sk->pm".

This commit log needs to be updated. Should be "msk->pm", not "sk->pm".
Please update this for me:

'''
and mptcp_pm_data_reset() as "msk->pm", so use "pm" directly instead
of using "msk->pm".
'''

Thanks,
-Geliang

> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  net/mptcp/pm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 8e6a325a3898..04a156395aad 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -511,13 +511,13 @@ void mptcp_pm_fully_established(struct
> mptcp_sock *msk, const struct sock *ssk)
>  	 * be sure to serve this event only once.
>  	 */
>  	if (READ_ONCE(pm->work_pending) &&
> -	    !(msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))
> +	    !(pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))
>  		mptcp_pm_schedule_work(msk, MPTCP_PM_ESTABLISHED);
>  
> -	if ((msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) ==
> 0)
> +	if ((pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) == 0)
>  		announce = true;
>  
> -	msk->pm.status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);
> +	pm->status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);
>  	spin_unlock_bh(&pm->lock);
>  
>  	if (announce)
> @@ -1009,7 +1009,7 @@ void mptcp_pm_data_reset(struct mptcp_sock
> *msk)
>  	WRITE_ONCE(pm->addr_signal, 0);
>  	WRITE_ONCE(pm->remote_deny_join_id0, false);
>  	pm->status = 0;
> -	bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID +
> 1);
> +	bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
>  }
>  
>  void mptcp_pm_data_init(struct mptcp_sock *msk)
Matthieu Baerts March 5, 2025, 3:34 p.m. UTC | #2 
Hi Geliang,

On 05/03/2025 02:01, Geliang Tang wrote:
> Hi Matt,
> 
> On Tue, 2025-03-04 at 15:16 +0800, Geliang Tang wrote:
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> The variable "pm" has been defined in mptcp_pm_fully_established()
>> and mptcp_pm_data_reset() as "sk->pm", so use "pm" directly instead
>> of using "sk->pm".
> 
> This commit log needs to be updated. Should be "msk->pm", not "sk->pm".
> Please update this for me:
> 
> '''
> and mptcp_pm_data_reset() as "msk->pm", so use "pm" directly instead
> of using "msk->pm".
> '''

Thanks, done:

- 568332d0da48: tg:msg: s/sk/msk/

Cheers,
Matt
diff mbox series

Patch

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 8e6a325a3898..04a156395aad 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -511,13 +511,13 @@  void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk)
 	 * be sure to serve this event only once.
 	 */
 	if (READ_ONCE(pm->work_pending) &&
-	    !(msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))
+	    !(pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))
 		mptcp_pm_schedule_work(msk, MPTCP_PM_ESTABLISHED);
 
-	if ((msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) == 0)
+	if ((pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) == 0)
 		announce = true;
 
-	msk->pm.status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);
+	pm->status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);
 	spin_unlock_bh(&pm->lock);
 
 	if (announce)
@@ -1009,7 +1009,7 @@  void mptcp_pm_data_reset(struct mptcp_sock *msk)
 	WRITE_ONCE(pm->addr_signal, 0);
 	WRITE_ONCE(pm->remote_deny_join_id0, false);
 	pm->status = 0;
-	bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
+	bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
 }
 
 void mptcp_pm_data_init(struct mptcp_sock *msk)