[PATCH v6 4/6] disk: don't try search for partition type if already set