d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly implement the "id" callback argument in the "idr_for_each" function

Browse Source 
in the LinuxKPI. The old implementation assumed only one IDR layer was present.
Take additional IDR layers into account when computing the "id" value.

MFC after:	1 week
Found by:	Karthik Palanichamy <karthikp@chelsio.com>
Tested by:	Karthik Palanichamy <karthikp@chelsio.com>
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2018-01-24 13:37:07 +00:00
parent 14a6bab1da
commit f885420d3c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/compat/linuxkpi/common/src/linux_idr.c
View File

@ -680,7 +680,7 @@ idr_alloc_cyclic(struct idr *idr, void *ptr, int start, int end, gfp_t gfp_mask)
}
static int
idr_for_each_layer(struct idr_layer *il, int layer,
idr_for_each_layer(struct idr_layer *il, int offset, int layer,
int (*f)(int id, void *p, void *data), void *data)
{
int i, err;
@ -691,7 +691,7 @@ idr_for_each_layer(struct idr_layer *il, int layer,
for (i = 0; i < IDR_SIZE; i++) {
if (il->ary[i] == NULL)
continue;
err = f(i, il->ary[i], data);
err = f(i + offset, il->ary[i], data);
if (err)
return (err);
}
@ -700,7 +700,8 @@ idr_for_each_layer(struct idr_layer *il, int layer,
for (i = 0; i < IDR_SIZE; i++) {
if (il->ary[i] == NULL)
continue;
err = idr_for_each_layer(il->ary[i], layer - 1, f, data);
err = idr_for_each_layer(il->ary[i],
(i + offset) * IDR_SIZE, layer - 1, f, data);
if (err)
return (err);
}
@ -711,7 +712,7 @@ idr_for_each_layer(struct idr_layer *il, int layer,
int
idr_for_each(struct idr *idp, int (*f)(int id, void *p, void *data), void *data)
{
return (idr_for_each_layer(idp->top, idp->layers - 1, f, data));
return (idr_for_each_layer(idp->top, 0, idp->layers - 1, f, data));
}
int