Merge ef79f2dec7 ("tracing: Correct the refcount if the hist/hist_debug file fails to open") into android16-6.12
Steps on the way to 6.12.23 Resolves merge conflicts in: net/ipv4/udp.c Change-Id: Ida343c74a69a3f4c3f358486ef6339b55a5e6afe Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -165,6 +165,14 @@ static void dst_count_dec(struct dst_entry *dst)
|
||||
void dst_release(struct dst_entry *dst)
|
||||
{
|
||||
if (dst && rcuref_put(&dst->__rcuref)) {
|
||||
#ifdef CONFIG_DST_CACHE
|
||||
if (dst->flags & DST_METADATA) {
|
||||
struct metadata_dst *md_dst = (struct metadata_dst *)dst;
|
||||
|
||||
if (md_dst->type == METADATA_IP_TUNNEL)
|
||||
dst_cache_reset_now(&md_dst->u.tun_info.dst_cache);
|
||||
}
|
||||
#endif
|
||||
dst_count_dec(dst);
|
||||
call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user