summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-09 19:29:42 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-10 20:24:58 +0200
commit9504466c9038497bc72f80715dc4ee8c3d90ed13 (patch)
treecdfb4dfdcc039c7d9ede3737ab9986bebdc922e1 /include/linux
parentc06c03bba03f18f2f75b3c280b4a5351cadc7be3 (diff)
downloadlinux-stable-9504466c9038497bc72f80715dc4ee8c3d90ed13.tar.gz
linux-stable-9504466c9038497bc72f80715dc4ee8c3d90ed13.tar.bz2
linux-stable-9504466c9038497bc72f80715dc4ee8c3d90ed13.zip
Revert "net/mlx5: Annotate mutex destroy for root ns"
This reverts commit 3f4f034a8676e366857861e76c3ad11ae059b2fb which is commit 9ca415399dae133b00273a4283ef31d003a6818d upstream. It was backported incorrectly, Paul writes at: https://lore.kernel.org/r/20200607203425.GD23662@windriver.com I happened to notice this commit: 9ca415399dae - "net/mlx5: Annotate mutex destroy for root ns" ...was backported to 4.19 and 5.4 and v5.6 in linux-stable. It patches del_sw_root_ns() - which only exists after v5.7-rc7 from: 6eb7a268a99b - "net/mlx5: Don't maintain a case of del_sw_func being null" which creates the one line del_sw_root_ns stub function around kfree(node) by breaking it out of tree_put_node(). In the absense of del_sw_root_ns - the backport finds an identical one line kfree stub fcn - named del_sw_prio from this earlier commit: 139ed6c6c46a - "net/mlx5: Fix steering memory leak" [in v4.15-rc5] and then puts the mutex_destroy() into that (wrong) function, instead of putting it into tree_put_node where the root ns case used to be hand Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Roi Dayan <roid@mellanox.com> Cc: Mark Bloch <markb@mellanox.com> Cc: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions