diff options
author | Christian Brauner <brauner@kernel.org> | 2025-09-17 12:01:05 +0200 |
---|---|---|
committer | Christian Brauner <brauner@kernel.org> | 2025-09-19 14:26:14 +0200 |
commit | 7914f15c5e45ea6c76f2b3272ff39d8fe67b13f5 (patch) | |
tree | 32385a82110d012928536d7787b024add8818f63 /net/xfrm/xfrm_state.c | |
parent | 885fc8ac0a4dc70f5d87b80b0977292870e35c60 (diff) | |
parent | 38f4885088fc5ad41b8b0a2a2cfc73d01e709e5c (diff) |
Merge branch 'no-rebase-mnt_ns_tree_remove'
Bring in the fix for removing a mount namespace from the mount namespace
rbtree and list.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 77db3b5fe4ac..78fcbb89cf32 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -3297,7 +3297,7 @@ void xfrm_state_fini(struct net *net) unsigned int sz; flush_work(&net->xfrm.state_hash_work); - xfrm_state_flush(net, IPSEC_PROTO_ANY, false); + xfrm_state_flush(net, 0, false); flush_work(&xfrm_state_gc_work); WARN_ON(!list_empty(&net->xfrm.state_all)); |