diff options
| author | Jim Warner <james.warner@comcast.net> | 2019-03-11 00:00:00 -0500 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2019-03-26 19:55:30 +1100 |
| commit | 47af06b52b41c470a56044851673ca646a1311e1 (patch) | |
| tree | ef3c6b487e74bd1bc82d3c2764903d2ef1287ba4 /proc/slabinfo.c | |
| parent | 32f93b56b7631df916b22e85b04b5f3b8c7dbc14 (diff) | |
| download | procps-ng-47af06b52b41c470a56044851673ca646a1311e1.tar.gz | |
library: repair any broken stuff found during refactor
Rather than offer three separate patches, they've been
consolidated in this single commit. All are related in
that they surfaced while preparing a subsequent patch.
------------------------------------------------------
library: correct a broken '#if define', <SLABINFO> api
It was introduced (embarrassingly) in the patch below.
Reference(s):
commit 97d078a9afbe4ed9949dc71acf7091fcf7971339
------------------------------------------------------
library: correct a broken 'GET' macro, <DISKSTATS> api
In the patch referenced below, which purported to make
all the 'GET' macros robust, the 'DISKSTATS_GET' macro
was broken. A necessary parameter wasn't passed to the
subsequently invoked function: procps_diskstats_get().
Reference(s):
commit bef8c7fb70164091071c792016371869b9c50ad2
------------------------------------------------------
library: correct a broken 'sort' func, <DISKSTATS> api
In the commit shown below, an attempt to normalize the
errno handling, the sort function inadvertently lost 1
crucial line of code which produces a consistent SEGV.
Reference(s):
commit 06be33b43e5ff3f2658e77ef79441ac2e970cfd7
Signed-off-by: Jim Warner <james.warner@comcast.net>
Diffstat (limited to 'proc/slabinfo.c')
| -rw-r--r-- | proc/slabinfo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/proc/slabinfo.c b/proc/slabinfo.c index 4049c1a..d1c4f98 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 ... */ |