Skip to contentSkip to conversation

SUNRPC: Remove comment for sp_lock

PATCH Applied Guoqing Jiang 3 participants 4 messages Apr 26, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SUNRPC: Remove comment for sp_lock

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

---
 net/sunrpc/svc_xprt.c | 1 -
 1 file changed, 1 deletion(-)
net/sunrpc/svc_xprt.c +0 -1
index b4a85a227bd7..ec78c277a02e 100644
@@ -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.
Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Guoqing Jiang

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

---
 net/sunrpc/svc_xprt.c | 1 -
 1 file changed, 1 deletion(-)
net/sunrpc/svc_xprt.c +0 -0
index b4a85a227bd7..ec78c277a02e 100644

net/sunrpc/svc_xprt.c static LIST_HEAD(svc_xprt_class_list); · line 51

Quoted 7 lines
net/sunrpc/svc_xprt.c +0 -1
@@ -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.

NeilBrown

#2 lore raw

Hi Neil,

Quoted 15 lines · NeilBrown
Quoted 14 lines · Guoqing Jiang

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

---
  net/sunrpc/svc_xprt.c | 1 -
  1 file changed, 1 deletion(-)
net/sunrpc/svc_xprt.c +0 -0
index b4a85a227bd7..ec78c277a02e 100644
@@ -46,7 +46,6 @@ static LIST_HEAD(svc_xprt_class_list);
 
Quoted 10 lines

net/sunrpc/svc_xprt.c static LIST_HEAD(svc_xprt_class_list); · line 51

Quoted 6 lines
net/sunrpc/svc_xprt.c +0 -1
  /* 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 😁.

Quoted 1 line

Thanks for your review!

Guoqing

Applied
#3 lore raw
In reply to Guoqing Jiang
Quoted 23 lines · Guoqing Jiang

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

---
 net/sunrpc/svc_xprt.c | 1 -
 1 file changed, 1 deletion(-)
net/sunrpc/svc_xprt.c +0 -1
index b4a85a227bd7..ec78c277a02e 100644
@@ -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.
Signature · 1 line
2.35.3

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

Signature · 1 line
Chuck Lever