| Message ID | 20240202163746.2489150-1-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 03ba6dc035c60991033529e630bd1552b2bca4d7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dst: Make dst_destroy() static and return void. | expand |
On Fri, Feb 2, 2024 at 5:37 PM Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote: > > Since commit 52df157f17e56 ("xfrm: take refcnt of dst when creating > struct xfrm_dst bundle") dst_destroy() returns only NULL and no caller > cares about the return value. > There are no in in-tree users of dst_destroy() outside of the file. > > Make dst_destroy() static and return void. > > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> This seems legit, thanks. Reviewed-by: Eric Dumazet <edumazet@google.com>
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Fri, 2 Feb 2024 17:37:46 +0100 you wrote: > Since commit 52df157f17e56 ("xfrm: take refcnt of dst when creating > struct xfrm_dst bundle") dst_destroy() returns only NULL and no caller > cares about the return value. > There are no in in-tree users of dst_destroy() outside of the file. > > Make dst_destroy() static and return void. > > [...] Here is the summary with links: - [net-next] net: dst: Make dst_destroy() static and return void. https://git.kernel.org/netdev/net-next/c/03ba6dc035c6 You are awesome, thank you!
diff --git a/include/net/dst.h b/include/net/dst.h index f5dfc8fb7b379..0aa331bd2fdb7 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -390,7 +390,6 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, void dst_init(struct dst_entry *dst, struct dst_ops *ops, struct net_device *dev, int initial_obsolete, unsigned short flags); -struct dst_entry *dst_destroy(struct dst_entry *dst); void dst_dev_put(struct dst_entry *dst); static inline void dst_confirm(struct dst_entry *dst) diff --git a/net/core/dst.c b/net/core/dst.c index 6838d3212c374..95f533844f17f 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -96,7 +96,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev, } EXPORT_SYMBOL(dst_alloc); -struct dst_entry *dst_destroy(struct dst_entry * dst) +static void dst_destroy(struct dst_entry *dst) { struct dst_entry *child = NULL; @@ -126,15 +126,13 @@ struct dst_entry *dst_destroy(struct dst_entry * dst) dst = child; if (dst) dst_release_immediate(dst); - return NULL; } -EXPORT_SYMBOL(dst_destroy); static void dst_destroy_rcu(struct rcu_head *head) { struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head); - dst = dst_destroy(dst); + dst_destroy(dst); } /* Operations to mark dst as DEAD and clean up the net device referenced
Since commit 52df157f17e56 ("xfrm: take refcnt of dst when creating struct xfrm_dst bundle") dst_destroy() returns only NULL and no caller cares about the return value. There are no in in-tree users of dst_destroy() outside of the file. Make dst_destroy() static and return void. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- include/net/dst.h | 1 - net/core/dst.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-)