2024-04-26 03:48:07

by Guoqing Jiang

Subject: [PATCH] SUNRPC: Remove comment for sp_lock

It is obsolete since sp_lock was discarded in commit 580a25756a9f
("SUNRPC: discard sp_lock").

Signed-off-by: Guoqing Jiang <[email protected]>
---
net/sunrpc/svc_xprt.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index b4a85a227bd7..ec78c277a02e 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -46,7 +46,6 @@ static LIST_HEAD(svc_xprt_class_list);

/* SMP locking strategy:
*
- * svc_pool->sp_lock protects most of the fields of that pool.
* svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
* when both need to be taken (rare), svc_serv->sv_lock is first.
* The "service mutex" protects svc_serv->sv_nrthread.
--
2.35.3

2024-04-26 04:11:58

by NeilBrown

Subject: Re: [PATCH] SUNRPC: Remove comment for sp_lock

On Fri, 26 Apr 2024, Guoqing Jiang wrote:
> It is obsolete since sp_lock was discarded in commit 580a25756a9f
> ("SUNRPC: discard sp_lock").
>
> Signed-off-by: Guoqing Jiang <[email protected]>
> ---
> net/sunrpc/svc_xprt.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
> index b4a85a227bd7..ec78c277a02e 100644
> --- a/net/sunrpc/svc_xprt.c
> +++ b/net/sunrpc/svc_xprt.c
> @@ -46,7 +46,6 @@ static LIST_HEAD(svc_xprt_class_list);
>
> /* SMP locking strategy:
> *
> - * svc_pool->sp_lock protects most of the fields of that pool.
> * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
> * when both need to be taken (rare), svc_serv->sv_lock is first.
> * The "service mutex" protects svc_serv->sv_nrthread.


I usually make an effort to find those sorts of things but I obviously
missed it this time.
Thanks.

Reviewed-by: NeilBrown <[email protected]>

NeilBrown

2024-04-26 06:16:05

by Guoqing Jiang

Subject: Re: [PATCH] SUNRPC: Remove comment for sp_lock

Hi Neil,

On 4/26/24 12:06, NeilBrown wrote:
> On Fri, 26 Apr 2024, Guoqing Jiang wrote:
>> It is obsolete since sp_lock was discarded in commit 580a25756a9f
>> ("SUNRPC: discard sp_lock").
>>
>> Signed-off-by: Guoqing Jiang <[email protected]>
>> ---
>> net/sunrpc/svc_xprt.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
>> index b4a85a227bd7..ec78c277a02e 100644
>> --- a/net/sunrpc/svc_xprt.c
>> +++ b/net/sunrpc/svc_xprt.c
>> @@ -46,7 +46,6 @@ static LIST_HEAD(svc_xprt_class_list);
>>
>> /* SMP locking strategy:
>> *
>> - * svc_pool->sp_lock protects most of the fields of that pool.
>> * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
>> * when both need to be taken (rare), svc_serv->sv_lock is first.
>> * The "service mutex" protects svc_serv->sv_nrthread.
>
> I usually make an effort to find those sorts of things but I obviously
> missed it this time.
> Thanks.

I find it occasionally during investigate one nfs issue ????.

> Reviewed-by: NeilBrown <[email protected]>

Thanks for your review!

Guoqing

2024-04-26 13:04:33

by Chuck Lever

Subject: Re: [PATCH] SUNRPC: Remove comment for sp_lock

On Fri, Apr 26, 2024 at 11:47:50AM +0800, Guoqing Jiang wrote:
> It is obsolete since sp_lock was discarded in commit 580a25756a9f
> ("SUNRPC: discard sp_lock").
>
> Signed-off-by: Guoqing Jiang <[email protected]>
> ---
> net/sunrpc/svc_xprt.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
> index b4a85a227bd7..ec78c277a02e 100644
> --- a/net/sunrpc/svc_xprt.c
> +++ b/net/sunrpc/svc_xprt.c
> @@ -46,7 +46,6 @@ static LIST_HEAD(svc_xprt_class_list);
>
> /* SMP locking strategy:
> *
> - * svc_pool->sp_lock protects most of the fields of that pool.
> * svc_serv->sv_lock protects sv_tempsocks, sv_permsocks, sv_tmpcnt.
> * when both need to be taken (rare), svc_serv->sv_lock is first.
> * The "service mutex" protects svc_serv->sv_nrthread.
> --
> 2.35.3
>

Applied to nfsd-next (for 6.10). Thank you!


--
Chuck Lever