summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_osd.c
diff options
context:
space:
mode:
authorcem <cem@FreeBSD.org>2016-04-26 19:57:35 +0000
committercem <cem@FreeBSD.org>2016-04-26 19:57:35 +0000
commit973e9835356274e0b1048152e1e59d363a00bcc9 (patch)
tree5e2497f4308883a70696069012a3d15db8658415 /sys/kern/kern_osd.c
parentfb3f38bb0debbc390330daf9b681d6905ed5ce18 (diff)
downloadFreeBSD-src-973e9835356274e0b1048152e1e59d363a00bcc9.zip
FreeBSD-src-973e9835356274e0b1048152e1e59d363a00bcc9.tar.gz
osd(9): Change array pointer to array pointer type from void*
This is a minor follow-up to r297422, prompted by a Coverity warning. (It's not a real defect, just a code smell.) OSD slot array reservations are an array of pointers (void **) but were cast to void* and back unnecessarily. Keep the correct type from reservation to use. osd.9 is updated to match, along with a few trivial igor fixes. Reported by: Coverity CID: 1353811 Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/kern/kern_osd.c')
-rw-r--r--sys/kern/kern_osd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c
index 41d518f..8dd29f8 100644
--- a/sys/kern/kern_osd.c
+++ b/sys/kern/kern_osd.c
@@ -202,7 +202,7 @@ osd_set(u_int type, struct osd *osd, u_int slot, void *value)
return (osd_set_reserved(type, osd, slot, NULL, value));
}
-void *
+void **
osd_reserve(u_int slot)
{
@@ -213,7 +213,7 @@ osd_reserve(u_int slot)
}
int
-osd_set_reserved(u_int type, struct osd *osd, u_int slot, void *rsv,
+osd_set_reserved(u_int type, struct osd *osd, u_int slot, void **rsv,
void *value)
{
struct rm_priotracker tracker;
@@ -224,7 +224,7 @@ osd_set_reserved(u_int type, struct osd *osd, u_int slot, void *rsv,
rm_rlock(&osdm[type].osd_object_lock, &tracker);
if (slot > osd->osd_nslots) {
- void *newptr;
+ void **newptr;
if (value == NULL) {
OSD_DEBUG(
@@ -283,7 +283,7 @@ osd_set_reserved(u_int type, struct osd *osd, u_int slot, void *rsv,
}
void
-osd_free_reserved(void *rsv)
+osd_free_reserved(void **rsv)
{
OSD_DEBUG("Discarding reserved slot array.");
OpenPOWER on IntegriCloud