summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2017-02-13 16:03:55 -0500
committerMatthew Wilcox <mawilcox@microsoft.com>2017-02-13 21:44:10 -0500
commit7e73eb0b2df5e8d7bd00a3c5980ab86619699963 (patch)
tree1e99281360d8f07189e71f4032ddddb52f2c8fb6 /lib
parentd7b627277b57370223d682cede979a279284b12a (diff)
downloadlinux-stable-7e73eb0b2df5e8d7bd00a3c5980ab86619699963.tar.gz
linux-stable-7e73eb0b2df5e8d7bd00a3c5980ab86619699963.tar.bz2
linux-stable-7e73eb0b2df5e8d7bd00a3c5980ab86619699963.zip
idr: Add missing __rcu annotations
Where we use the radix tree iteration macros, we need to annotate 'slot' with __rcu. Make sure we don't forget any new places in the future with the same CFLAGS check used for radix-tree.c. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile1
-rw-r--r--lib/idr.c14
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 2fc096985b21..43a80ec3bd10 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,6 +25,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
earlycpio.o seq_buf.o nmi_backtrace.o nodemask.o win_minmax.o
CFLAGS_radix-tree.o += -DCONFIG_SPARSE_RCU_POINTER
+CFLAGS_idr.o += -DCONFIG_SPARSE_RCU_POINTER
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
diff --git a/lib/idr.c b/lib/idr.c
index 7d25e240bc5a..b13682bb0a1c 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -28,7 +28,7 @@ static DEFINE_SPINLOCK(simple_ida_lock);
*/
int idr_alloc(struct idr *idr, void *ptr, int start, int end, gfp_t gfp)
{
- void **slot;
+ void __rcu **slot;
struct radix_tree_iter iter;
if (WARN_ON_ONCE(start < 0))
@@ -98,7 +98,7 @@ int idr_for_each(const struct idr *idr,
int (*fn)(int id, void *p, void *data), void *data)
{
struct radix_tree_iter iter;
- void **slot;
+ void __rcu **slot;
radix_tree_for_each_slot(slot, &idr->idr_rt, &iter, 0) {
int ret = fn(iter.index, rcu_dereference_raw(*slot), data);
@@ -123,7 +123,7 @@ EXPORT_SYMBOL(idr_for_each);
void *idr_get_next(struct idr *idr, int *nextid)
{
struct radix_tree_iter iter;
- void **slot;
+ void __rcu **slot;
slot = radix_tree_iter_find(&idr->idr_rt, &iter, *nextid);
if (!slot)
@@ -151,7 +151,7 @@ EXPORT_SYMBOL(idr_get_next);
void *idr_replace(struct idr *idr, void *ptr, int id)
{
struct radix_tree_node *node;
- void **slot = NULL;
+ void __rcu **slot = NULL;
void *entry;
if (WARN_ON_ONCE(id < 0))
@@ -250,7 +250,7 @@ EXPORT_SYMBOL(idr_replace);
int ida_get_new_above(struct ida *ida, int start, int *id)
{
struct radix_tree_root *root = &ida->ida_rt;
- void **slot;
+ void __rcu **slot;
struct radix_tree_iter iter;
struct ida_bitmap *bitmap;
unsigned long index;
@@ -350,7 +350,7 @@ void ida_remove(struct ida *ida, int id)
struct ida_bitmap *bitmap;
unsigned long *btmp;
struct radix_tree_iter iter;
- void **slot;
+ void __rcu **slot;
slot = radix_tree_iter_lookup(&ida->ida_rt, &iter, index);
if (!slot)
@@ -396,7 +396,7 @@ EXPORT_SYMBOL(ida_remove);
void ida_destroy(struct ida *ida)
{
struct radix_tree_iter iter;
- void **slot;
+ void __rcu **slot;
radix_tree_for_each_slot(slot, &ida->ida_rt, &iter, 0) {
struct ida_bitmap *bitmap = rcu_dereference_raw(*slot);