Merge branch 'no-rebase-mnt_ns_tree_remove' into work.mount

Al Viro · Al Viro · commit 1b966c4471e6 · 2025-09-17T15:58:06.000-04:00
diff --git a/fs/namespace.c b/fs/namespace.c
@@ -195,7 +195,7 @@ static void mnt_ns_release_rcu(struct rcu_head *rcu)
 static void mnt_ns_tree_remove(struct mnt_namespace *ns)
 {
 	/* remove from global mount namespace list */
-	if (!is_anon_ns(ns)) {
+	if (!RB_EMPTY_NODE(&ns->mnt_ns_tree_node)) {
 		mnt_ns_tree_write_lock();
 		rb_erase(&ns->mnt_ns_tree_node, &mnt_ns_tree);
 		list_bidir_del_rcu(&ns->mnt_ns_list);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ static void mnt_ns_release_rcu(struct rcu_head *rcu)`
`195`	`195`	`static void mnt_ns_tree_remove(struct mnt_namespace *ns)`
`196`	`196`	`{`
`197`	`197`	`/* remove from global mount namespace list */`
`198`		`- if (!is_anon_ns(ns)) {`
	`198`	`+ if (!RB_EMPTY_NODE(&ns->mnt_ns_tree_node)) {`
`199`	`199`	`mnt_ns_tree_write_lock();`
`200`	`200`	`rb_erase(&ns->mnt_ns_tree_node, &mnt_ns_tree);`
`201`	`201`	`list_bidir_del_rcu(&ns->mnt_ns_list);`