git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UBI: fix ubi_wl_flush
[pandora-kernel.git]
/
lib
/
idr.c
diff --git
a/lib/idr.c
b/lib/idr.c
index
5ca67b3
..
afbb0b1
100644
(file)
--- a/
lib/idr.c
+++ b/
lib/idr.c
@@
-120,7
+120,7
@@
static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
int n, m, sh;
struct idr_layer *p, *new;
int l, id, oid;
int n, m, sh;
struct idr_layer *p, *new;
int l, id, oid;
- long bm;
+
unsigned
long bm;
id = *starting_id;
restart:
id = *starting_id;
restart:
@@
-405,7
+405,7
@@
EXPORT_SYMBOL(idr_remove);
*/
void idr_remove_all(struct idr *idp)
{
*/
void idr_remove_all(struct idr *idp)
{
- int n, id, max
, error = 0
;
+ int n, id, max;
struct idr_layer *p;
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer **paa = &pa[0];
struct idr_layer *p;
struct idr_layer *pa[MAX_LEVEL];
struct idr_layer **paa = &pa[0];
@@
-415,7
+415,7
@@
void idr_remove_all(struct idr *idp)
max = 1 << n;
id = 0;
max = 1 << n;
id = 0;
- while (id < max
&& !error
) {
+ while (id < max) {
while (n > IDR_BITS && p) {
n -= IDR_BITS;
*paa++ = p;
while (n > IDR_BITS && p) {
n -= IDR_BITS;
*paa++ = p;
@@
-580,8
+580,7
@@
void *idr_replace(struct idr *idp, void *ptr, int id)
}
EXPORT_SYMBOL(idr_replace);
}
EXPORT_SYMBOL(idr_replace);
-static void idr_cache_ctor(void * idr_layer, struct kmem_cache *idr_layer_cache,
- unsigned long flags)
+static void idr_cache_ctor(struct kmem_cache *idr_layer_cache, void *idr_layer)
{
memset(idr_layer, 0, sizeof(struct idr_layer));
}
{
memset(idr_layer, 0, sizeof(struct idr_layer));
}
@@
-590,7
+589,7
@@
static int init_id_cache(void)
{
if (!idr_layer_cache)
idr_layer_cache = kmem_cache_create("idr_layer_cache",
{
if (!idr_layer_cache)
idr_layer_cache = kmem_cache_create("idr_layer_cache",
- sizeof(struct idr_layer), 0, 0, idr_cache_ctor
, NULL
);
+ sizeof(struct idr_layer), 0, 0, idr_cache_ctor);
return 0;
}
return 0;
}