Simplify getdiskinfo() a bit while I am here: don't save error codes that we will never refer to again.