diff --git a/proc/diskstats.c b/proc/diskstats.c index e935bb3c..134f6e01 100644 --- a/proc/diskstats.c +++ b/proc/diskstats.c @@ -989,7 +989,9 @@ PROCPS_EXPORT struct diskstats_stack **procps_diskstats_sort ( } errno = 0; + parms.offset = offset; parms.order = order; + qsort_r(stacks, numstacked, sizeof(void *), (QSR_t)Item_table[p->item].sortfunc, &parms); return stacks; } // end: procps_diskstats_sort diff --git a/proc/diskstats.h b/proc/diskstats.h index 92195c3d..8b9b8d00 100644 --- a/proc/diskstats.h +++ b/proc/diskstats.h @@ -91,7 +91,7 @@ struct diskstats_reap { #define DISKSTATS_TYPE_PARTITION -22222 #define DISKSTATS_GET( info, name, actual_enum, type ) ( { \ - struct diskstats_result *r = procps_diskstats_get( info, actual_enum ); \ + struct diskstats_result *r = procps_diskstats_get( info, name, actual_enum ); \ r ? r->result . type : 0; } ) #define DISKSTATS_VAL( relative_enum, type, stack, info ) \ diff --git a/proc/slabinfo.c b/proc/slabinfo.c index 4049c1a8..d1c4f98f 100644 --- a/proc/slabinfo.c +++ b/proc/slabinfo.c @@ -584,6 +584,7 @@ static void slabinfo_itemize_stacks_all ( static inline int slabinfo_items_check_failed ( + struct ext_support *this, enum slabinfo_item *items, int numitems) { @@ -615,6 +616,7 @@ static inline int slabinfo_items_check_failed ( return 1; if (items[i] >= SLABINFO_logical_end) return 1; + (void)this; #endif } @@ -741,7 +743,7 @@ static int slabinfo_stacks_reconfig_maybe ( enum slabinfo_item *items, int numitems) { - if (slabinfo_items_check_failed(items, numitems)) + if (slabinfo_items_check_failed(this, items, numitems)) return -1; /* is this the first time or have things changed since we were last called? if so, gotta' redo all of our stacks stuff ... */