svn commit: r335412 - in stable/11/sys/compat/linuxkpi/common: include/linux src

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jun 20 06:36:25 2018
New Revision: 335412
URL: https://svnweb.freebsd.org/changeset/base/335412

Log:
  MFC r334483:
  Implement radix_tree_iter_delete() in the LinuxKPI.
  
  Submitted by:	Johannes Lundberg <johalun0 at gmail.com>
  Sponsored by:	Mellanox Technologies
  Sponsored by:	Limelight Networks

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/radix-tree.h
  stable/11/sys/compat/linuxkpi/common/src/linux_radix.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/radix-tree.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/radix-tree.h	Wed Jun 20 06:35:37 2018	(r335411)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/radix-tree.h	Wed Jun 20 06:36:25 2018	(r335412)
@@ -79,5 +79,6 @@ void	*radix_tree_lookup(struct radix_tree_root *, unsi
 void	*radix_tree_delete(struct radix_tree_root *, unsigned long);
 int	radix_tree_insert(struct radix_tree_root *, unsigned long, void *);
 bool	radix_tree_iter_find(struct radix_tree_root *, struct radix_tree_iter *, void ***);
+void	radix_tree_iter_delete(struct radix_tree_root *, struct radix_tree_iter *, void **);
 
 #endif	/* _LINUX_RADIX_TREE_H_ */

Modified: stable/11/sys/compat/linuxkpi/common/src/linux_radix.c
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/src/linux_radix.c	Wed Jun 20 06:35:37 2018	(r335411)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_radix.c	Wed Jun 20 06:36:25 2018	(r335412)
@@ -162,6 +162,13 @@ out:
 	return (item);
 }
 
+void
+radix_tree_iter_delete(struct radix_tree_root *root,
+    struct radix_tree_iter *iter, void **slot)
+{
+	radix_tree_delete(root, iter->index);
+}
+
 int
 radix_tree_insert(struct radix_tree_root *root, unsigned long index, void *item)
 {