| Message ID | 20231201211549.126941-3-anna@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | SUNRPC: Various RCU fixes | expand |
On Fri, 2023-12-01 at 16:15 -0500, Anna Schumaker wrote: > From: Anna Schumaker <Anna.Schumaker@Netapp.com> > > Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> > --- > include/linux/sunrpc/clnt.h | 1 - > net/sunrpc/clnt.c | 8 -------- > 2 files changed, 9 deletions(-) > > diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h > index e9d4377d03c6..5e9d1469c6fa 100644 > --- a/include/linux/sunrpc/clnt.h > +++ b/include/linux/sunrpc/clnt.h > @@ -252,7 +252,6 @@ void rpc_clnt_probe_trunked_xprts(struct rpc_clnt *, > > const char *rpc_proc_name(const struct rpc_task *task); > > -void rpc_clnt_xprt_switch_put(struct rpc_clnt *); > void rpc_clnt_xprt_switch_add_xprt(struct rpc_clnt *, struct rpc_xprt *); > void rpc_clnt_xprt_switch_remove_xprt(struct rpc_clnt *, struct rpc_xprt *); > bool rpc_clnt_xprt_switch_has_addr(struct rpc_clnt *clnt, > diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c > index 4aa838543f79..8df944444e9b 100644 > --- a/net/sunrpc/clnt.c > +++ b/net/sunrpc/clnt.c > @@ -3247,14 +3247,6 @@ rpc_set_connect_timeout(struct rpc_clnt *clnt, > } > EXPORT_SYMBOL_GPL(rpc_set_connect_timeout); > > -void rpc_clnt_xprt_switch_put(struct rpc_clnt *clnt) > -{ > - rcu_read_lock(); > - xprt_switch_put(rcu_dereference(clnt->cl_xpi.xpi_xpswitch)); > - rcu_read_unlock(); > -} > -EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_put); > - > void rpc_clnt_xprt_set_online(struct rpc_clnt *clnt, struct rpc_xprt *xprt) > { > struct rpc_xprt_switch *xps; Nice catch. Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index e9d4377d03c6..5e9d1469c6fa 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -252,7 +252,6 @@ void rpc_clnt_probe_trunked_xprts(struct rpc_clnt *, const char *rpc_proc_name(const struct rpc_task *task); -void rpc_clnt_xprt_switch_put(struct rpc_clnt *); void rpc_clnt_xprt_switch_add_xprt(struct rpc_clnt *, struct rpc_xprt *); void rpc_clnt_xprt_switch_remove_xprt(struct rpc_clnt *, struct rpc_xprt *); bool rpc_clnt_xprt_switch_has_addr(struct rpc_clnt *clnt, diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 4aa838543f79..8df944444e9b 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -3247,14 +3247,6 @@ rpc_set_connect_timeout(struct rpc_clnt *clnt, } EXPORT_SYMBOL_GPL(rpc_set_connect_timeout); -void rpc_clnt_xprt_switch_put(struct rpc_clnt *clnt) -{ - rcu_read_lock(); - xprt_switch_put(rcu_dereference(clnt->cl_xpi.xpi_xpswitch)); - rcu_read_unlock(); -} -EXPORT_SYMBOL_GPL(rpc_clnt_xprt_switch_put); - void rpc_clnt_xprt_set_online(struct rpc_clnt *clnt, struct rpc_xprt *xprt) { struct rpc_xprt_switch *xps;