lib/idr.c: remove simple_ida_lock (b94078e6) · Commits · 戴 / test

lib/idr.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4,9 +4,9 @@
	#include <linux/idr.h>		#include <linux/idr.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/spinlock.h>		#include <linux/spinlock.h>
			#include <linux/xarray.h>

	DEFINE_PER_CPU(struct ida_bitmap *, ida_bitmap);		DEFINE_PER_CPU(struct ida_bitmap *, ida_bitmap);
	static DEFINE_SPINLOCK(simple_ida_lock);

	/**		/**
	* idr_alloc_u32() - Allocate an ID.		* idr_alloc_u32() - Allocate an ID.
	@@ -581,7 +581,7 @@ again:
	if (!ida_pre_get(ida, gfp_mask))		if (!ida_pre_get(ida, gfp_mask))
	return -ENOMEM;		return -ENOMEM;

	spin_lock_irqsave(&simple_ida_lock, flags);		xa_lock_irqsave(&ida->ida_rt, flags);
	ret = ida_get_new_above(ida, start, &id);		ret = ida_get_new_above(ida, start, &id);
	if (!ret) {		if (!ret) {
	if (id > max) {		if (id > max) {
	@@ -591,7 +591,7 @@ again:
	ret = id;		ret = id;
	}		}
	}		}
	spin_unlock_irqrestore(&simple_ida_lock, flags);		xa_unlock_irqrestore(&ida->ida_rt, flags);

	if (unlikely(ret == -EAGAIN))		if (unlikely(ret == -EAGAIN))
	goto again;		goto again;
	@@ -615,8 +615,8 @@ void ida_simple_remove(struct ida *ida, unsigned int id)
	unsigned long flags;		unsigned long flags;

	BUG_ON((int)id < 0);		BUG_ON((int)id < 0);
	spin_lock_irqsave(&simple_ida_lock, flags);		xa_lock_irqsave(&ida->ida_rt, flags);
	ida_remove(ida, id);		ida_remove(ida, id);
	spin_unlock_irqrestore(&simple_ida_lock, flags);		xa_unlock_irqrestore(&ida->ida_rt, flags);
	}		}
	EXPORT_SYMBOL(ida_simple_remove);		EXPORT_SYMBOL(ida_simple_remove);