Patch from Rick Lindsley <ricklind@us.ibm.com>

Fixes a couple of odd cases in which disk requests were not being accounted
for.