summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-09-14 11:59:49 +0000
committermav <mav@FreeBSD.org>2014-09-14 11:59:49 +0000
commitb2cfbc4e0b52141ee58095a937470e16d117d2eb (patch)
tree3f0b0e7bce731f1cb0ecedd9f972dbaea5aa95dd /sbin
parent60440293773e9af3886aaab92d13d54304b91b64 (diff)
downloadFreeBSD-src-b2cfbc4e0b52141ee58095a937470e16d117d2eb.zip
FreeBSD-src-b2cfbc4e0b52141ee58095a937470e16d117d2eb.tar.gz
Update CAM CCB accounting for the new status quo.
devq_openings counter lost its meaning after allocation queues has gone. held counter is still meaningful, but problematic to update due to separate locking of CCB allocation and queuing. To fix that replace devq_openings counter with allocated counter. held is now calculated on request as difference between number of allocated, queued and active CCBs. MFC after: 1 month
Diffstat (limited to 'sbin')
-rw-r--r--sbin/camcontrol/camcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 12a0e5c..4129cf4 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -4469,9 +4469,9 @@ tagcontrol(struct cam_device *device, int argc, char **argv,
fprintf(stdout, "%s", pathstr);
fprintf(stdout, "dev_active %d\n", ccb->cgds.dev_active);
fprintf(stdout, "%s", pathstr);
- fprintf(stdout, "devq_openings %d\n", ccb->cgds.devq_openings);
+ fprintf(stdout, "allocated %d\n", ccb->cgds.allocated);
fprintf(stdout, "%s", pathstr);
- fprintf(stdout, "devq_queued %d\n", ccb->cgds.devq_queued);
+ fprintf(stdout, "queued %d\n", ccb->cgds.queued);
fprintf(stdout, "%s", pathstr);
fprintf(stdout, "held %d\n", ccb->cgds.held);
fprintf(stdout, "%s", pathstr);
OpenPOWER on IntegriCloud