summaryrefslogtreecommitdiffstats
path: root/lib/libmemstat
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2006-02-11 18:55:03 +0000
committerrwatson <rwatson@FreeBSD.org>2006-02-11 18:55:03 +0000
commitc1cbeeaeb19973cbf315fbadd0c28b95dc18120f (patch)
tree02a55a9bd23a20b4741e42e4a4e4643dcd98238a /lib/libmemstat
parent35f263ed8094442ba47235c1afef07d7552e2cd3 (diff)
downloadFreeBSD-src-c1cbeeaeb19973cbf315fbadd0c28b95dc18120f.zip
FreeBSD-src-c1cbeeaeb19973cbf315fbadd0c28b95dc18120f.tar.gz
When reporting an error reading from UMA per-cpu cache pointers using KVM,
return a KVM error rather than an out of memory error, so that the caller reports the KVM error state. This replaces a misleading error message with a more accurate although equally confusing one. MFC after: 3 days
Diffstat (limited to 'lib/libmemstat')
-rw-r--r--lib/libmemstat/memstat_uma.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libmemstat/memstat_uma.c b/lib/libmemstat/memstat_uma.c
index 924b7c2..dfbf31c 100644
--- a/lib/libmemstat/memstat_uma.c
+++ b/lib/libmemstat/memstat_uma.c
@@ -397,8 +397,7 @@ memstat_kvm_uma(struct memory_type_list *list, void *kvm_handle)
&ub, sizeof(ub), 0);
if (ret != 0) {
_memstat_mtl_empty(list);
- list->mtl_error =
- MEMSTAT_ERROR_NOMEMORY;
+ list->mtl_error = ret;
return (-1);
}
mtp->mt_free += ub.ub_cnt;
@@ -408,8 +407,7 @@ memstat_kvm_uma(struct memory_type_list *list, void *kvm_handle)
&ub, sizeof(ub), 0);
if (ret != 0) {
_memstat_mtl_empty(list);
- list->mtl_error =
- MEMSTAT_ERROR_NOMEMORY;
+ list->mtl_error = ret;
return (-1);
}
mtp->mt_free += ub.ub_cnt;
OpenPOWER on IntegriCloud