diff options
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/mtdcore.c | 2 | ||||
| -rw-r--r-- | include/linux/idr.h | 4 | ||||
| -rw-r--r-- | lib/idr.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a5dca6affcbb..b84e4b27a77a 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -500,7 +500,7 @@ int conn_lowest_minor(struct drbd_tconn *tconn) int vnr = 0, m; rcu_read_lock(); - mdev = idr_get_next(&tconn->volumes, &vnr); + mdev = idr_find_next(&tconn->volumes, &vnr); m = mdev ? mdev_to_minor(mdev) : -1; rcu_read_unlock(); diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 9e3f441e7e84..8fa7eb17092a 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -2837,7 +2837,7 @@ int get_one_status(struct sk_buff *skb, struct netlink_callback *cb) } if (tconn) { next_tconn: - mdev = idr_get_next(&tconn->volumes, &volume); + mdev = idr_find_next(&tconn->volumes, &volume); if (!mdev) { /* No more volumes to dump on this tconn. * Advance tconn iterator. */ diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index c400c57c394a..eaa1fccc5bdd 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(mtd_table_mutex); struct mtd_info *__mtd_next_device(int i) { - return idr_get_next(&mtd_idr, &i); + return idr_find_next(&mtd_idr, &i); } EXPORT_SYMBOL_GPL(__mtd_next_device); diff --git a/include/linux/idr.h b/include/linux/idr.h index 148d2a9dd11d..90ef61c1b044 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h @@ -80,7 +80,7 @@ int idr_alloc(struct idr *idp, void *ptr, int start, int end, gfp_t gfp_mask); int idr_alloc_cyclic(struct idr *idr, void *ptr, int start, int end, gfp_t gfp_mask); int idr_for_each(struct idr *idp, int (*fn)(int id, void *p, void *data), void *data); -void *idr_get_next(struct idr *idp, int *nextid); +void *idr_find_next(struct idr *idp, int *nextid); void *idr_replace(struct idr *idp, void *ptr, int id); void idr_remove(struct idr *idp, int id); void idr_free(struct idr *idp, int id); @@ -131,7 +131,7 @@ static inline void *idr_find(struct idr *idr, int id) * is convenient for a "not found" value. */ #define idr_for_each_entry(idp, entry, id) \ - for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id) + for (id = 0; ((entry) = idr_find_next(idp, &(id))) != NULL; ++id) /* * Don't use the following functions. These exist only to suppress diff --git a/lib/idr.c b/lib/idr.c index 990e146cb10c..f08fef89f6bf 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -749,7 +749,7 @@ int idr_for_each(struct idr *idp, EXPORT_SYMBOL(idr_for_each); /** - * idr_get_next - lookup next object of id to given id. + * idr_find_next - lookup next object of id to given id. * @idp: idr handle * @nextidp: pointer to lookup key * @@ -760,7 +760,7 @@ EXPORT_SYMBOL(idr_for_each); * This function can be called under rcu_read_lock(), given that the leaf * pointers lifetimes are correctly managed. */ -void *idr_get_next(struct idr *idp, int *nextidp) +void *idr_find_next(struct idr *idp, int *nextidp) { struct idr_layer *p, *pa[MAX_IDR_LEVEL + 1]; struct idr_layer **paa = &pa[0]; @@ -801,7 +801,7 @@ void *idr_get_next(struct idr *idp, int *nextidp) } return NULL; } -EXPORT_SYMBOL(idr_get_next); +EXPORT_SYMBOL(idr_find_next); /** |